diff --git a/.gitignore b/.gitignore index 6e2e2b0..9a6f694 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ dali-builder /build/desktop /packaging/home* *.mo +demo-theme.json diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index ce0a4eb..bc137c2 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -33,14 +33,14 @@ IF(NOT DEFINED LOCALE_DIR) SET(LOCALE_DIR ${PREFIX}/share/locale) ENDIF() -SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\") -SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\") -SET(DALI_SCRIPT_DIR \\"${SCRIPTS_DIR}\\") -SET(DALI_STYLE_DIR \\"${STYLE_DIR}\\") -SET(DALI_DEMO_THEME_PATH \\"${STYLE_DIR}/demo-theme.json\\") -SET(DALI_EXAMPLE_BIN \\"${BINDIR}/\\") -SET(DALI_LOCALE_DIR \\"${LOCALE_DIR}\\") -SET(DALI_LANG \\"${LANG}\\") +SET(DEMO_IMAGE_DIR \\"${IMAGES_DIR}\\") +SET(DEMO_MODEL_DIR \\"${MODELS_DIR}\\") +SET(DEMO_SCRIPT_DIR \\"${SCRIPTS_DIR}\\") +SET(DEMO_STYLE_DIR \\"${STYLE_DIR}\\") +SET(DEMO_THEME_PATH \\"${STYLE_DIR}/demo-theme.json\\") +SET(DEMO_EXAMPLE_BIN \\"${BINDIR}/\\") +SET(DEMO_LOCALE_DIR \\"${LOCALE_DIR}\\") +SET(DEMO_LANG \\"${LANG}\\") FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png") FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg") @@ -66,9 +66,13 @@ FOREACH(flag ${LOCAL_SCRIPTS_LIST}) INSTALL(FILES ${LOCAL_SCRIPTS_DIR}/${flag} DESTINATION ${SCRIPTS_DIR}) ENDFOREACH(flag) +#Replace @DEMO_STYLE_IMAGE_DIR@ in following files +SET(DEMO_STYLE_IMAGE_DIR ${IMAGES_DIR}) +CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json ) INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR}) -SET(PKG_LIST dali +SET(PKG_LIST dali-core + dali-adaptor dali-toolkit) INCLUDE(FindPkgConfig) @@ -78,7 +82,7 @@ FOREACH(flag ${REQUIRED_PKGS_CFLAGS}) SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}") ENDFOREACH(flag) -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}") +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}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall") SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp index b63986f..ac2b1df 100644 --- a/builder/dali-builder.cpp +++ b/builder/dali-builder.cpp @@ -199,9 +199,9 @@ private: builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit ); Property::Map defaultDirs; - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR; - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR; - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR; + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR; + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR; builder.AddConstants( defaultDirs ); @@ -297,15 +297,10 @@ private: //------------------------------------------------------------------------------ int main(int argc, char **argv) { - Application dali_app = Application::New(&argc, &argv); + Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH); ExampleApp app(dali_app); - std::cout << "DALi Core: \t" << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << " (" << CORE_BUILD_DATE << ")" << std::endl; - std::cout << "DALi Adaptor: \t" << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << " (" << ADAPTOR_BUILD_DATE << ")\n"; - std::cout << "DALi Toolkit: \t" << Toolkit::TOOLKIT_MAJOR_VERSION << "." << Toolkit::TOOLKIT_MINOR_VERSION << "." << Toolkit::TOOLKIT_MICRO_VERSION << " (" << Toolkit::TOOLKIT_BUILD_DATE << ")\n"; - - if(argc > 1) { std::cout << "Loading file:" << argc << " " << argv[1] << std::endl; diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index 8c296a6..2517645 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -127,4 +127,10 @@ + + + + + + diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp index 1f1b3db..f50152c 100644 --- a/demo/dali-demo.cpp +++ b/demo/dali-demo.cpp @@ -27,11 +27,11 @@ using namespace Dali; int main(int argc, char **argv) { // Configure gettext for internalization - bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DALI_LOCALE_DIR); + bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR); textdomain(DALI_DEMO_DOMAIN_LOCAL); - setlocale(LC_ALL, DALI_LANG); + setlocale(LC_ALL, DEMO_LANG); - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); // Create the demo launcher DaliTableView demo(app); @@ -69,6 +69,8 @@ int main(int argc, char **argv) demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH)); demo.AddExample(Example("gradients.example", DALI_DEMO_STR_TITLE_COLOR_GRADIENT)); demo.AddExample(Example("image-view.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW)); + demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA)); + demo.AddExample(Example("image-view-alpha-blending.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING)); demo.AddExample(Example("super-blur-bloom.example", DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM)); demo.SortAlphabetically( true ); diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index e1ff174..51689a2 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -37,10 +37,10 @@ using namespace Dali::Toolkit; namespace { -const std::string LOGO_PATH( DALI_IMAGE_DIR "Logo-for-demo.png" ); -const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar.png" ); -const std::string TILE_BACKGROUND(DALI_IMAGE_DIR "item-background.9.png"); -const std::string TILE_BACKGROUND_ALPHA(DALI_IMAGE_DIR "item-background-alpha.9.png"); +const std::string LOGO_PATH( DEMO_IMAGE_DIR "Logo-for-demo.png" ); +const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DEMO_IMAGE_DIR "top-bar.png" ); +const std::string TILE_BACKGROUND(DEMO_IMAGE_DIR "item-background.9.png"); +const std::string TILE_BACKGROUND_ALPHA(DEMO_IMAGE_DIR "item-background-alpha.9.png"); const char * const DEFAULT_TOOLBAR_TEXT( "TOUCH TO LAUNCH EXAMPLE" ); @@ -562,7 +562,7 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source ) std::string name = mPressedActor.GetName(); std::stringstream stream; - stream << DALI_EXAMPLE_BIN << name.c_str(); + stream << DEMO_EXAMPLE_BIN << name.c_str(); pid_t pid = fork(); if( pid == 0) { diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp index a73bb25..3d46680 100644 --- a/examples/atlas/atlas-example.cpp +++ b/examples/atlas/atlas-example.cpp @@ -28,10 +28,10 @@ class AtlasController; namespace { -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" ); -const char * const LOSE_CONTEXT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-cluster-wobble-selected.png" ); +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" ); +const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" ); Application gApplication; AtlasController* gAtlasController(NULL); @@ -79,28 +79,28 @@ public: mAtlas = Atlas::New( 400,700, Pixel::RGBA8888); mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f)); - mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-cross.png", 100, 80 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-fold.png", 150, 80 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-wave.png", 200, 80 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 ); - mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-change.png", 50, 30 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effects-on.png", 150, 30 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-cross.png", 100, 80 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-fold.png", 150, 80 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-wave.png", 200, 80 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 ); + mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); UploadBufferImages(); UploadPixelData(); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 304 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 304 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 304 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 436 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 436 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 436 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 568 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 568 ); - mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 568 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-1.jpg", 4, 304 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-2.jpg", 136, 304 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-3.jpg", 268, 304 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-4.jpg", 4, 436 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-5.jpg", 136, 436 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-6.jpg", 268, 436 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 4, 568 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 136, 568 ); + mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 268, 568 ); Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas ); @@ -236,7 +236,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - gApplication = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + gApplication = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( gApplication ); diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 7b257cf..96e1e51 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -29,115 +29,115 @@ using namespace Dali::Toolkit; namespace { const char* IMAGE_PATH[] = { - DALI_IMAGE_DIR "gallery-medium-1.jpg", - DALI_IMAGE_DIR "gallery-medium-2.jpg", - DALI_IMAGE_DIR "gallery-medium-3.jpg", - DALI_IMAGE_DIR "gallery-medium-4.jpg", - DALI_IMAGE_DIR "gallery-medium-5.jpg", - DALI_IMAGE_DIR "gallery-medium-6.jpg", - DALI_IMAGE_DIR "gallery-medium-7.jpg", - DALI_IMAGE_DIR "gallery-medium-8.jpg", - DALI_IMAGE_DIR "gallery-medium-9.jpg", - DALI_IMAGE_DIR "gallery-medium-10.jpg", - DALI_IMAGE_DIR "gallery-medium-11.jpg", - DALI_IMAGE_DIR "gallery-medium-12.jpg", - DALI_IMAGE_DIR "gallery-medium-13.jpg", - DALI_IMAGE_DIR "gallery-medium-14.jpg", - DALI_IMAGE_DIR "gallery-medium-15.jpg", - DALI_IMAGE_DIR "gallery-medium-16.jpg", - DALI_IMAGE_DIR "gallery-medium-17.jpg", - DALI_IMAGE_DIR "gallery-medium-18.jpg", - DALI_IMAGE_DIR "gallery-medium-19.jpg", - DALI_IMAGE_DIR "gallery-medium-20.jpg", - DALI_IMAGE_DIR "gallery-medium-21.jpg", - DALI_IMAGE_DIR "gallery-medium-22.jpg", - DALI_IMAGE_DIR "gallery-medium-23.jpg", - DALI_IMAGE_DIR "gallery-medium-24.jpg", - DALI_IMAGE_DIR "gallery-medium-25.jpg", - DALI_IMAGE_DIR "gallery-medium-26.jpg", - DALI_IMAGE_DIR "gallery-medium-27.jpg", - DALI_IMAGE_DIR "gallery-medium-28.jpg", - DALI_IMAGE_DIR "gallery-medium-29.jpg", - DALI_IMAGE_DIR "gallery-medium-30.jpg", - DALI_IMAGE_DIR "gallery-medium-31.jpg", - DALI_IMAGE_DIR "gallery-medium-32.jpg", - DALI_IMAGE_DIR "gallery-medium-33.jpg", - DALI_IMAGE_DIR "gallery-medium-34.jpg", - DALI_IMAGE_DIR "gallery-medium-35.jpg", - DALI_IMAGE_DIR "gallery-medium-36.jpg", - DALI_IMAGE_DIR "gallery-medium-37.jpg", - DALI_IMAGE_DIR "gallery-medium-38.jpg", - DALI_IMAGE_DIR "gallery-medium-39.jpg", - DALI_IMAGE_DIR "gallery-medium-40.jpg", - DALI_IMAGE_DIR "gallery-medium-41.jpg", - DALI_IMAGE_DIR "gallery-medium-42.jpg", - DALI_IMAGE_DIR "gallery-medium-43.jpg", - DALI_IMAGE_DIR "gallery-medium-44.jpg", - DALI_IMAGE_DIR "gallery-medium-45.jpg", - DALI_IMAGE_DIR "gallery-medium-46.jpg", - DALI_IMAGE_DIR "gallery-medium-47.jpg", - DALI_IMAGE_DIR "gallery-medium-48.jpg", - DALI_IMAGE_DIR "gallery-medium-49.jpg", - DALI_IMAGE_DIR "gallery-medium-50.jpg", - DALI_IMAGE_DIR "gallery-medium-51.jpg", - DALI_IMAGE_DIR "gallery-medium-52.jpg", - DALI_IMAGE_DIR "gallery-medium-53.jpg", + DEMO_IMAGE_DIR "gallery-medium-1.jpg", + DEMO_IMAGE_DIR "gallery-medium-2.jpg", + DEMO_IMAGE_DIR "gallery-medium-3.jpg", + DEMO_IMAGE_DIR "gallery-medium-4.jpg", + DEMO_IMAGE_DIR "gallery-medium-5.jpg", + DEMO_IMAGE_DIR "gallery-medium-6.jpg", + DEMO_IMAGE_DIR "gallery-medium-7.jpg", + DEMO_IMAGE_DIR "gallery-medium-8.jpg", + DEMO_IMAGE_DIR "gallery-medium-9.jpg", + DEMO_IMAGE_DIR "gallery-medium-10.jpg", + DEMO_IMAGE_DIR "gallery-medium-11.jpg", + DEMO_IMAGE_DIR "gallery-medium-12.jpg", + DEMO_IMAGE_DIR "gallery-medium-13.jpg", + DEMO_IMAGE_DIR "gallery-medium-14.jpg", + DEMO_IMAGE_DIR "gallery-medium-15.jpg", + DEMO_IMAGE_DIR "gallery-medium-16.jpg", + DEMO_IMAGE_DIR "gallery-medium-17.jpg", + DEMO_IMAGE_DIR "gallery-medium-18.jpg", + DEMO_IMAGE_DIR "gallery-medium-19.jpg", + DEMO_IMAGE_DIR "gallery-medium-20.jpg", + DEMO_IMAGE_DIR "gallery-medium-21.jpg", + DEMO_IMAGE_DIR "gallery-medium-22.jpg", + DEMO_IMAGE_DIR "gallery-medium-23.jpg", + DEMO_IMAGE_DIR "gallery-medium-24.jpg", + DEMO_IMAGE_DIR "gallery-medium-25.jpg", + DEMO_IMAGE_DIR "gallery-medium-26.jpg", + DEMO_IMAGE_DIR "gallery-medium-27.jpg", + DEMO_IMAGE_DIR "gallery-medium-28.jpg", + DEMO_IMAGE_DIR "gallery-medium-29.jpg", + DEMO_IMAGE_DIR "gallery-medium-30.jpg", + DEMO_IMAGE_DIR "gallery-medium-31.jpg", + DEMO_IMAGE_DIR "gallery-medium-32.jpg", + DEMO_IMAGE_DIR "gallery-medium-33.jpg", + DEMO_IMAGE_DIR "gallery-medium-34.jpg", + DEMO_IMAGE_DIR "gallery-medium-35.jpg", + DEMO_IMAGE_DIR "gallery-medium-36.jpg", + DEMO_IMAGE_DIR "gallery-medium-37.jpg", + DEMO_IMAGE_DIR "gallery-medium-38.jpg", + DEMO_IMAGE_DIR "gallery-medium-39.jpg", + DEMO_IMAGE_DIR "gallery-medium-40.jpg", + DEMO_IMAGE_DIR "gallery-medium-41.jpg", + DEMO_IMAGE_DIR "gallery-medium-42.jpg", + DEMO_IMAGE_DIR "gallery-medium-43.jpg", + DEMO_IMAGE_DIR "gallery-medium-44.jpg", + DEMO_IMAGE_DIR "gallery-medium-45.jpg", + DEMO_IMAGE_DIR "gallery-medium-46.jpg", + DEMO_IMAGE_DIR "gallery-medium-47.jpg", + DEMO_IMAGE_DIR "gallery-medium-48.jpg", + DEMO_IMAGE_DIR "gallery-medium-49.jpg", + DEMO_IMAGE_DIR "gallery-medium-50.jpg", + DEMO_IMAGE_DIR "gallery-medium-51.jpg", + DEMO_IMAGE_DIR "gallery-medium-52.jpg", + DEMO_IMAGE_DIR "gallery-medium-53.jpg", }; const char* NINEPATCH_IMAGE_PATH[] = { - DALI_IMAGE_DIR "selection-popup-bg.1.9.png", - DALI_IMAGE_DIR "selection-popup-bg.2.9.png", - DALI_IMAGE_DIR "selection-popup-bg.3.9.png", - DALI_IMAGE_DIR "selection-popup-bg.4.9.png", - DALI_IMAGE_DIR "selection-popup-bg.5.9.png", - DALI_IMAGE_DIR "selection-popup-bg.6.9.png", - DALI_IMAGE_DIR "selection-popup-bg.7.9.png", - DALI_IMAGE_DIR "selection-popup-bg.8.9.png", - DALI_IMAGE_DIR "selection-popup-bg.9.9.png", - DALI_IMAGE_DIR "selection-popup-bg.10.9.png", - DALI_IMAGE_DIR "selection-popup-bg.11.9.png", - DALI_IMAGE_DIR "selection-popup-bg.12.9.png", - DALI_IMAGE_DIR "selection-popup-bg.13.9.png", - DALI_IMAGE_DIR "selection-popup-bg.14.9.png", - DALI_IMAGE_DIR "selection-popup-bg.15.9.png", - DALI_IMAGE_DIR "selection-popup-bg.16.9.png", - DALI_IMAGE_DIR "selection-popup-bg.17.9.png", - DALI_IMAGE_DIR "selection-popup-bg.18.9.png", - DALI_IMAGE_DIR "selection-popup-bg.19.9.png", - DALI_IMAGE_DIR "selection-popup-bg.20.9.png", - DALI_IMAGE_DIR "selection-popup-bg.21.9.png", - DALI_IMAGE_DIR "selection-popup-bg.22.9.png", - DALI_IMAGE_DIR "selection-popup-bg.23.9.png", - DALI_IMAGE_DIR "selection-popup-bg.24.9.png", - DALI_IMAGE_DIR "selection-popup-bg.25.9.png", - DALI_IMAGE_DIR "selection-popup-bg.26.9.png", - DALI_IMAGE_DIR "selection-popup-bg.27.9.png", - DALI_IMAGE_DIR "selection-popup-bg.28.9.png", - DALI_IMAGE_DIR "selection-popup-bg.29.9.png", - DALI_IMAGE_DIR "selection-popup-bg.30.9.png", - DALI_IMAGE_DIR "selection-popup-bg.31.9.png", - DALI_IMAGE_DIR "selection-popup-bg.32.9.png", - DALI_IMAGE_DIR "selection-popup-bg.33.9.png", - DALI_IMAGE_DIR "button-disabled.9.png", - DALI_IMAGE_DIR "button-down.9.png", - DALI_IMAGE_DIR "button-down-disabled.9.png", - DALI_IMAGE_DIR "button-up-1.9.png", - DALI_IMAGE_DIR "button-up-2.9.png", - DALI_IMAGE_DIR "button-up-3.9.png", - DALI_IMAGE_DIR "button-up-4.9.png", - DALI_IMAGE_DIR "button-up-5.9.png", - DALI_IMAGE_DIR "button-up-6.9.png", - DALI_IMAGE_DIR "button-up-7.9.png", - DALI_IMAGE_DIR "button-up-8.9.png", - DALI_IMAGE_DIR "button-up-9.9.png", - DALI_IMAGE_DIR "button-up-10.9.png", - DALI_IMAGE_DIR "button-up-11.9.png", - DALI_IMAGE_DIR "button-up-12.9.png", - DALI_IMAGE_DIR "button-up-13.9.png", - DALI_IMAGE_DIR "button-up-14.9.png", - DALI_IMAGE_DIR "button-up-15.9.png", - DALI_IMAGE_DIR "button-up-16.9.png", - DALI_IMAGE_DIR "button-up-17.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.1.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.2.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.3.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.4.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.5.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.6.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.7.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.8.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.9.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.10.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.11.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.12.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.13.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.14.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.15.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.16.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.17.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.18.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.19.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.20.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.21.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.22.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.23.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.24.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.25.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.26.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.27.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.28.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.29.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.30.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.31.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.32.9.png", + DEMO_IMAGE_DIR "selection-popup-bg.33.9.png", + DEMO_IMAGE_DIR "button-disabled.9.png", + DEMO_IMAGE_DIR "button-down.9.png", + DEMO_IMAGE_DIR "button-down-disabled.9.png", + DEMO_IMAGE_DIR "button-up-1.9.png", + DEMO_IMAGE_DIR "button-up-2.9.png", + DEMO_IMAGE_DIR "button-up-3.9.png", + DEMO_IMAGE_DIR "button-up-4.9.png", + DEMO_IMAGE_DIR "button-up-5.9.png", + DEMO_IMAGE_DIR "button-up-6.9.png", + DEMO_IMAGE_DIR "button-up-7.9.png", + DEMO_IMAGE_DIR "button-up-8.9.png", + DEMO_IMAGE_DIR "button-up-9.9.png", + DEMO_IMAGE_DIR "button-up-10.9.png", + DEMO_IMAGE_DIR "button-up-11.9.png", + DEMO_IMAGE_DIR "button-up-12.9.png", + DEMO_IMAGE_DIR "button-up-13.9.png", + DEMO_IMAGE_DIR "button-up-14.9.png", + DEMO_IMAGE_DIR "button-up-15.9.png", + DEMO_IMAGE_DIR "button-up-16.9.png", + DEMO_IMAGE_DIR "button-up-17.9.png", }; const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*); diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index d61b86d..c9c336a 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -31,17 +31,17 @@ using namespace DemoHelper; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-blocks.jpg" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-blocks.jpg" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE( "DALi Blocks" ); -const char* BALL_IMAGE = DALI_IMAGE_DIR "blocks-ball.png"; -const char* PADDLE_IMAGE = DALI_IMAGE_DIR "blocks-paddle.png"; -const char* PADDLE_HANDLE_IMAGE = DALI_IMAGE_DIR "blocks-paddle-handle.png"; +const char* BALL_IMAGE = DEMO_IMAGE_DIR "blocks-ball.png"; +const char* PADDLE_IMAGE = DEMO_IMAGE_DIR "blocks-paddle.png"; +const char* PADDLE_HANDLE_IMAGE = DEMO_IMAGE_DIR "blocks-paddle-handle.png"; -const char* BRICK_IMAGE_PATH[] = { DALI_IMAGE_DIR "blocks-brick-1.png", - DALI_IMAGE_DIR "blocks-brick-2.png", - DALI_IMAGE_DIR "blocks-brick-3.png", - DALI_IMAGE_DIR "blocks-brick-4.png" }; +const char* BRICK_IMAGE_PATH[] = { DEMO_IMAGE_DIR "blocks-brick-1.png", + DEMO_IMAGE_DIR "blocks-brick-2.png", + DEMO_IMAGE_DIR "blocks-brick-3.png", + DEMO_IMAGE_DIR "blocks-brick-4.png" }; const int TOTAL_BRICKS(4); ///< Total bricks in game. const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f); @@ -838,7 +838,7 @@ void RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp index c0b6c00..d2f27dc 100644 --- a/examples/bubble-effect/bubble-effect-example.cpp +++ b/examples/bubble-effect/bubble-effect-example.cpp @@ -24,29 +24,29 @@ using namespace Dali; namespace { -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const APPLICATION_TITLE( "Bubble Effect" ); -const char * const CHANGE_BACKGROUND_ICON( DALI_IMAGE_DIR "icon-change.png" ); -const char * const CHANGE_BACKGROUND_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); -const char * const CHANGE_BUBBLE_SHAPE_ICON( DALI_IMAGE_DIR "icon-replace.png" ); -const char * const CHANGE_BUBBLE_SHAPE_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); +const char * const CHANGE_BACKGROUND_ICON( DEMO_IMAGE_DIR "icon-change.png" ); +const char * const CHANGE_BACKGROUND_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); +const char * const CHANGE_BUBBLE_SHAPE_ICON( DEMO_IMAGE_DIR "icon-replace.png" ); +const char * const CHANGE_BUBBLE_SHAPE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" ); const char* BACKGROUND_IMAGES[]= { - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-2.jpg", - DALI_IMAGE_DIR "background-3.jpg", - DALI_IMAGE_DIR "background-4.jpg", - DALI_IMAGE_DIR "background-5.jpg", + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-2.jpg", + DEMO_IMAGE_DIR "background-3.jpg", + DEMO_IMAGE_DIR "background-4.jpg", + DEMO_IMAGE_DIR "background-5.jpg", }; const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) ); const char* BUBBLE_SHAPE_IMAGES[] = { - DALI_IMAGE_DIR "bubble-ball.png", - DALI_IMAGE_DIR "icon-effect-cross.png", - DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", - DALI_IMAGE_DIR "icon-replace.png" + DEMO_IMAGE_DIR "bubble-ball.png", + DEMO_IMAGE_DIR "icon-effect-cross.png", + DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png", + DEMO_IMAGE_DIR "icon-replace.png" }; const unsigned int NUM_BUBBLE_SHAPE_IMAGES( sizeof( BUBBLE_SHAPE_IMAGES ) / sizeof( BUBBLE_SHAPE_IMAGES[0] ) ); @@ -322,12 +322,9 @@ RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); return 0; } - - - diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp index 2402e42..fe2f88b 100644 --- a/examples/builder/examples.cpp +++ b/examples/builder/examples.cpp @@ -51,9 +51,9 @@ namespace { const char* BACKGROUND_IMAGE( "" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char* EDIT_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); -const char* EDIT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* EDIT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* EDIT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); std::string USER_DIRECTORY; @@ -306,7 +306,7 @@ public: } else { - DirectoryFilesByType( DALI_SCRIPT_DIR, "json", files ); + DirectoryFilesByType( DEMO_SCRIPT_DIR, "json", files ); } std::sort(files.begin(), files.end()); @@ -414,9 +414,9 @@ public: builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit ); Property::Map defaultDirs; - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR; - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR; - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR; + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR; + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR; builder.AddConstants( defaultDirs ); @@ -618,7 +618,7 @@ int main(int argc, char **argv) } } - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); ExampleApp dali_app(app); diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp index 11979db..d26e888 100644 --- a/examples/buttons/buttons-example.cpp +++ b/examples/buttons/buttons-example.cpp @@ -29,21 +29,21 @@ using namespace Dali; namespace { -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg"; -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg"; +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png"; const char* const TOOLBAR_TITLE = "Buttons"; -const char* const SMALL_IMAGE_1 = DALI_IMAGE_DIR "gallery-small-14.jpg"; -const char* const BIG_IMAGE_1 = DALI_IMAGE_DIR "gallery-large-4.jpg"; +const char* const SMALL_IMAGE_1 = DEMO_IMAGE_DIR "gallery-small-14.jpg"; +const char* const BIG_IMAGE_1 = DEMO_IMAGE_DIR "gallery-large-4.jpg"; -const char* const SMALL_IMAGE_2 = DALI_IMAGE_DIR "gallery-small-20.jpg"; -const char* const BIG_IMAGE_2 = DALI_IMAGE_DIR "gallery-large-11.jpg"; +const char* const SMALL_IMAGE_2 = DEMO_IMAGE_DIR "gallery-small-20.jpg"; +const char* const BIG_IMAGE_2 = DEMO_IMAGE_DIR "gallery-large-11.jpg"; -const char* const SMALL_IMAGE_3 = DALI_IMAGE_DIR "gallery-small-25.jpg"; -const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR "gallery-large-13.jpg"; +const char* const SMALL_IMAGE_3 = DEMO_IMAGE_DIR "gallery-small-25.jpg"; +const char* const BIG_IMAGE_3 = DEMO_IMAGE_DIR "gallery-large-13.jpg"; -const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png"; +const char* const ENABLED_IMAGE = DEMO_IMAGE_DIR "item-select-check.png"; const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); @@ -546,7 +546,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp index 967a01a..99dfe79 100644 --- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp +++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp @@ -20,9 +20,9 @@ using namespace Dali; using Dali::Toolkit::TextLabel; -const char* IMAGE_FILENAME_ETC = DALI_IMAGE_DIR "tx-etc1.ktx"; -const char* IMAGE_FILENAME_ASTC_LINEAR = DALI_IMAGE_DIR "tx-astc-4x4-linear.ktx"; -const char* IMAGE_FILENAME_ASTC_LINEAR_NATIVE = DALI_IMAGE_DIR "tx-astc-4x4-linear-native.astc"; +const char* IMAGE_FILENAME_ETC = DEMO_IMAGE_DIR "tx-etc1.ktx"; +const char* IMAGE_FILENAME_ASTC_LINEAR = DEMO_IMAGE_DIR "tx-astc-4x4-linear.ktx"; +const char* IMAGE_FILENAME_ASTC_LINEAR_NATIVE = DEMO_IMAGE_DIR "tx-astc-4x4-linear-native.astc"; /** * @brief This example shows 3 images, each of a different compressed texture type. diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp index 29fbdaf..621244e 100644 --- a/examples/cube-transition-effect/cube-transition-effect-example.cpp +++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp @@ -37,44 +37,44 @@ using Dali::Toolkit::TextLabel; namespace { -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const APPLICATION_TITLE_WAVE( "Cube Transition: Wave" ); const char * const APPLICATION_TITLE_CROSS( "Cube Transition: Cross" ); const char * const APPLICATION_TITLE_FOLD( "Cube Transition: Fold" ); -const char * const EFFECT_WAVE_IMAGE( DALI_IMAGE_DIR "icon-effect-wave.png" ); -const char * const EFFECT_WAVE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-wave-selected.png" ); -const char * const EFFECT_CROSS_IMAGE( DALI_IMAGE_DIR "icon-effect-cross.png" ); -const char * const EFFECT_CROSS_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-cross-selected.png" ); -const char * const EFFECT_FOLD_IMAGE( DALI_IMAGE_DIR "icon-effect-fold.png" ); -const char * const EFFECT_FOLD_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-effect-fold-selected.png" ); -const char * const SLIDE_SHOW_START_ICON( DALI_IMAGE_DIR "icon-play.png" ); -const char * const SLIDE_SHOW_START_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" ); -const char * const SLIDE_SHOW_STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" ); -const char * const SLIDE_SHOW_STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); +const char * const EFFECT_WAVE_IMAGE( DEMO_IMAGE_DIR "icon-effect-wave.png" ); +const char * const EFFECT_WAVE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-wave-selected.png" ); +const char * const EFFECT_CROSS_IMAGE( DEMO_IMAGE_DIR "icon-effect-cross.png" ); +const char * const EFFECT_CROSS_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-cross-selected.png" ); +const char * const EFFECT_FOLD_IMAGE( DEMO_IMAGE_DIR "icon-effect-fold.png" ); +const char * const EFFECT_FOLD_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-fold-selected.png" ); +const char * const SLIDE_SHOW_START_ICON( DEMO_IMAGE_DIR "icon-play.png" ); +const char * const SLIDE_SHOW_START_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" ); +const char * const SLIDE_SHOW_STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" ); +const char * const SLIDE_SHOW_STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" ); const char* IMAGES[] = { - DALI_IMAGE_DIR "gallery-large-1.jpg", - DALI_IMAGE_DIR "gallery-large-2.jpg", - DALI_IMAGE_DIR "gallery-large-3.jpg", - DALI_IMAGE_DIR "gallery-large-4.jpg", - DALI_IMAGE_DIR "gallery-large-5.jpg", - DALI_IMAGE_DIR "gallery-large-6.jpg", - DALI_IMAGE_DIR "gallery-large-7.jpg", - DALI_IMAGE_DIR "gallery-large-8.jpg", - DALI_IMAGE_DIR "gallery-large-9.jpg", - DALI_IMAGE_DIR "gallery-large-10.jpg", - DALI_IMAGE_DIR "gallery-large-11.jpg", - DALI_IMAGE_DIR "gallery-large-12.jpg", - DALI_IMAGE_DIR "gallery-large-13.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "gallery-large-15.jpg", - DALI_IMAGE_DIR "gallery-large-16.jpg", - DALI_IMAGE_DIR "gallery-large-17.jpg", - DALI_IMAGE_DIR "gallery-large-18.jpg", - DALI_IMAGE_DIR "gallery-large-19.jpg", - DALI_IMAGE_DIR "gallery-large-20.jpg", - DALI_IMAGE_DIR "gallery-large-21.jpg", + DEMO_IMAGE_DIR "gallery-large-1.jpg", + DEMO_IMAGE_DIR "gallery-large-2.jpg", + DEMO_IMAGE_DIR "gallery-large-3.jpg", + DEMO_IMAGE_DIR "gallery-large-4.jpg", + DEMO_IMAGE_DIR "gallery-large-5.jpg", + DEMO_IMAGE_DIR "gallery-large-6.jpg", + DEMO_IMAGE_DIR "gallery-large-7.jpg", + DEMO_IMAGE_DIR "gallery-large-8.jpg", + DEMO_IMAGE_DIR "gallery-large-9.jpg", + DEMO_IMAGE_DIR "gallery-large-10.jpg", + DEMO_IMAGE_DIR "gallery-large-11.jpg", + DEMO_IMAGE_DIR "gallery-large-12.jpg", + DEMO_IMAGE_DIR "gallery-large-13.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "gallery-large-15.jpg", + DEMO_IMAGE_DIR "gallery-large-16.jpg", + DEMO_IMAGE_DIR "gallery-large-17.jpg", + DEMO_IMAGE_DIR "gallery-large-18.jpg", + DEMO_IMAGE_DIR "gallery-large-19.jpg", + DEMO_IMAGE_DIR "gallery-large-20.jpg", + DEMO_IMAGE_DIR "gallery-large-21.jpg", }; const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) ); @@ -432,7 +432,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent& event) // Entry point for Linux & Tizen applications int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); CubeTransitionApp test( application ); application.MainLoop(); diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 5d81d17..10d1721 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -33,41 +33,41 @@ using Dali::Toolkit::TextLabel; namespace { -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const APPLICATION_TITLE_HIGHP( "Dissolve Effect(highp)" ); const char * const APPLICATION_TITLE_MEDIUMP( "Dissolve Effect(mediump)" ); -const char * const EFFECT_HIGHP_IMAGE( DALI_IMAGE_DIR "icon-highp.png" ); -const char * const EFFECT_HIGHP_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-highp-selected.png" ); -const char * const EFFECT_MEDIUMP_IMAGE( DALI_IMAGE_DIR "icon-mediump.png" ); -const char * const EFFECT_MEDIUMP_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-mediump-selected.png" ); -const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" ); -const char * const PLAY_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" ); -const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" ); -const char * const STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); +const char * const EFFECT_HIGHP_IMAGE( DEMO_IMAGE_DIR "icon-highp.png" ); +const char * const EFFECT_HIGHP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-highp-selected.png" ); +const char * const EFFECT_MEDIUMP_IMAGE( DEMO_IMAGE_DIR "icon-mediump.png" ); +const char * const EFFECT_MEDIUMP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-mediump-selected.png" ); +const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" ); +const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" ); +const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" ); +const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" ); const char* IMAGES[] = { - DALI_IMAGE_DIR "gallery-large-1.jpg", - DALI_IMAGE_DIR "gallery-large-2.jpg", - DALI_IMAGE_DIR "gallery-large-3.jpg", - DALI_IMAGE_DIR "gallery-large-4.jpg", - DALI_IMAGE_DIR "gallery-large-5.jpg", - DALI_IMAGE_DIR "gallery-large-6.jpg", - DALI_IMAGE_DIR "gallery-large-7.jpg", - DALI_IMAGE_DIR "gallery-large-8.jpg", - DALI_IMAGE_DIR "gallery-large-9.jpg", - DALI_IMAGE_DIR "gallery-large-10.jpg", - DALI_IMAGE_DIR "gallery-large-11.jpg", - DALI_IMAGE_DIR "gallery-large-12.jpg", - DALI_IMAGE_DIR "gallery-large-13.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "gallery-large-15.jpg", - DALI_IMAGE_DIR "gallery-large-16.jpg", - DALI_IMAGE_DIR "gallery-large-17.jpg", - DALI_IMAGE_DIR "gallery-large-18.jpg", - DALI_IMAGE_DIR "gallery-large-19.jpg", - DALI_IMAGE_DIR "gallery-large-20.jpg", - DALI_IMAGE_DIR "gallery-large-21.jpg", + DEMO_IMAGE_DIR "gallery-large-1.jpg", + DEMO_IMAGE_DIR "gallery-large-2.jpg", + DEMO_IMAGE_DIR "gallery-large-3.jpg", + DEMO_IMAGE_DIR "gallery-large-4.jpg", + DEMO_IMAGE_DIR "gallery-large-5.jpg", + DEMO_IMAGE_DIR "gallery-large-6.jpg", + DEMO_IMAGE_DIR "gallery-large-7.jpg", + DEMO_IMAGE_DIR "gallery-large-8.jpg", + DEMO_IMAGE_DIR "gallery-large-9.jpg", + DEMO_IMAGE_DIR "gallery-large-10.jpg", + DEMO_IMAGE_DIR "gallery-large-11.jpg", + DEMO_IMAGE_DIR "gallery-large-12.jpg", + DEMO_IMAGE_DIR "gallery-large-13.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "gallery-large-15.jpg", + DEMO_IMAGE_DIR "gallery-large-16.jpg", + DEMO_IMAGE_DIR "gallery-large-17.jpg", + DEMO_IMAGE_DIR "gallery-large-18.jpg", + DEMO_IMAGE_DIR "gallery-large-19.jpg", + DEMO_IMAGE_DIR "gallery-large-20.jpg", + DEMO_IMAGE_DIR "gallery-large-21.jpg", }; const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) ); @@ -443,7 +443,7 @@ bool DissolveEffectApp::OnTimerTick() // Entry point for Linux & Tizen applications int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); DissolveEffectApp test( application ); application.MainLoop(); diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index ca2b579..4a80036 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -27,9 +27,9 @@ namespace { const char * const APPLICATION_TITLE( "Color Gradients" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char * const CHANGE_ICON( DALI_IMAGE_DIR "icon-change.png" ); -const char * const CHANGE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char * const CHANGE_ICON( DEMO_IMAGE_DIR "icon-change.png" ); +const char * const CHANGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); } // This example shows how to render color gradients diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index c94c042..e34c8fe 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -27,18 +27,18 @@ using Toolkit::TextLabel; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); -const char* BORDER_IMAGE( DALI_IMAGE_DIR "border-4px.9.png" ); +const char* BORDER_IMAGE( DEMO_IMAGE_DIR "border-4px.9.png" ); const int BORDER_WIDTH = ( 11.0f + 4.0f ); // Shadow size = 11, border size = 4. -const char* RESIZE_HANDLE_IMAGE( DALI_IMAGE_DIR "resize-handle.png" ); +const char* RESIZE_HANDLE_IMAGE( DEMO_IMAGE_DIR "resize-handle.png" ); const int MARGIN_SIZE = 10; const char* const NEXT_BUTTON_ID = "NEXT_BUTTON"; const char* const PREVIOUS_BUTTON_ID = "PREVIOUS_BUTTON"; -const char * const DALI_ICON_PLAY = DALI_IMAGE_DIR "icon-play.png"; +const char * const DALI_ICON_PLAY = DEMO_IMAGE_DIR "icon-play.png"; const char* const FITTING_BUTTON_ID = "FITTING_BUTTON"; const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON"; @@ -52,29 +52,29 @@ const char* const STYLE_BUTTON_TEXT = "buttonlabel"; const char* IMAGE_PATHS[] = { // Variety of sizes, shapes and formats: - DALI_IMAGE_DIR "dali-logo.png", - DALI_IMAGE_DIR "layer1.png", - DALI_IMAGE_DIR "layer2.png", - DALI_IMAGE_DIR "animation-list.png", - DALI_IMAGE_DIR "music-libray-main-screen.png", - DALI_IMAGE_DIR "music-libray-record-cover.png", - DALI_IMAGE_DIR "contacts-background.png", - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "square_primitive_shapes.bmp", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "book-landscape-cover.jpg", - DALI_IMAGE_DIR "book-portrait-p1.jpg", - DALI_IMAGE_DIR "book-landscape-cover-back.jpg", + DEMO_IMAGE_DIR "dali-logo.png", + DEMO_IMAGE_DIR "layer1.png", + DEMO_IMAGE_DIR "layer2.png", + DEMO_IMAGE_DIR "animation-list.png", + DEMO_IMAGE_DIR "music-libray-main-screen.png", + DEMO_IMAGE_DIR "music-libray-record-cover.png", + DEMO_IMAGE_DIR "contacts-background.png", + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "square_primitive_shapes.bmp", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "book-landscape-cover.jpg", + DEMO_IMAGE_DIR "book-portrait-p1.jpg", + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg", // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered // black and white image: - DALI_IMAGE_DIR "gallery-large-14.wbmp", + DEMO_IMAGE_DIR "gallery-large-14.wbmp", - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-blocks.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-blocks.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", NULL }; const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; @@ -761,7 +761,7 @@ void RunTest( Application& application ) // Entry point for Linux & Tizen applications int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index e8642d0..39fe97c 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -61,11 +61,11 @@ namespace /** Controls the output of application logging. */ //#define DEBUG_PRINT_DIAGNOSTICS; -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE( "Image Scaling Modes" ); -const char* TOGGLE_SCALING_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); -const char* TOGGLE_SCALING_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char* TOGGLE_SCALING_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* TOGGLE_SCALING_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); /** The width of the grid in whole grid cells. */ const unsigned GRID_WIDTH = 9; @@ -104,64 +104,64 @@ const unsigned NUM_IMAGE_SIZES = sizeof(IMAGE_SIZES) / sizeof(IMAGE_SIZES[0]); * show the scaling. */ const char* IMAGE_PATHS[] = { - DALI_IMAGE_DIR "dali-logo.png", - DALI_IMAGE_DIR "com.samsung.dali-demo.ico", - DALI_IMAGE_DIR "square_primitive_shapes.bmp", - DALI_IMAGE_DIR "gallery-large-14.wbmp", + DEMO_IMAGE_DIR "dali-logo.png", + DEMO_IMAGE_DIR "com.samsung.dali-demo.ico", + DEMO_IMAGE_DIR "square_primitive_shapes.bmp", + DEMO_IMAGE_DIR "gallery-large-14.wbmp", // Images that show aspect ratio changes clearly in primitive shapes: - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif", // Images from other demos that are tall, wide or just large: - DALI_IMAGE_DIR "gallery-large-1.jpg", - DALI_IMAGE_DIR "gallery-large-2.jpg", - DALI_IMAGE_DIR "gallery-large-3.jpg", - DALI_IMAGE_DIR "gallery-large-4.jpg", - DALI_IMAGE_DIR "gallery-large-5.jpg", - DALI_IMAGE_DIR "gallery-large-6.jpg", - DALI_IMAGE_DIR "gallery-large-7.jpg", - DALI_IMAGE_DIR "gallery-large-8.jpg", - DALI_IMAGE_DIR "gallery-large-9.jpg", - DALI_IMAGE_DIR "gallery-large-10.jpg", - DALI_IMAGE_DIR "gallery-large-11.jpg", - DALI_IMAGE_DIR "gallery-large-12.jpg", - DALI_IMAGE_DIR "gallery-large-13.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "gallery-large-15.jpg", - DALI_IMAGE_DIR "gallery-large-16.jpg", - DALI_IMAGE_DIR "gallery-large-17.jpg", - DALI_IMAGE_DIR "gallery-large-18.jpg", - DALI_IMAGE_DIR "gallery-large-19.jpg", - DALI_IMAGE_DIR "gallery-large-20.jpg", - DALI_IMAGE_DIR "gallery-large-21.jpg", - - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-2.jpg", - DALI_IMAGE_DIR "background-3.jpg", - DALI_IMAGE_DIR "background-4.jpg", - DALI_IMAGE_DIR "background-5.jpg", - DALI_IMAGE_DIR "background-blocks.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", - - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-2.jpg", - DALI_IMAGE_DIR "background-3.jpg", - DALI_IMAGE_DIR "background-4.jpg", - DALI_IMAGE_DIR "background-5.jpg", - DALI_IMAGE_DIR "background-blocks.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", - - DALI_IMAGE_DIR "book-landscape-cover-back.jpg", - DALI_IMAGE_DIR "book-landscape-cover.jpg", - DALI_IMAGE_DIR "book-landscape-p1.jpg", - DALI_IMAGE_DIR "book-landscape-p2.jpg", - - DALI_IMAGE_DIR "book-portrait-cover.jpg", - DALI_IMAGE_DIR "book-portrait-p1.jpg", - DALI_IMAGE_DIR "book-portrait-p2.jpg", + DEMO_IMAGE_DIR "gallery-large-1.jpg", + DEMO_IMAGE_DIR "gallery-large-2.jpg", + DEMO_IMAGE_DIR "gallery-large-3.jpg", + DEMO_IMAGE_DIR "gallery-large-4.jpg", + DEMO_IMAGE_DIR "gallery-large-5.jpg", + DEMO_IMAGE_DIR "gallery-large-6.jpg", + DEMO_IMAGE_DIR "gallery-large-7.jpg", + DEMO_IMAGE_DIR "gallery-large-8.jpg", + DEMO_IMAGE_DIR "gallery-large-9.jpg", + DEMO_IMAGE_DIR "gallery-large-10.jpg", + DEMO_IMAGE_DIR "gallery-large-11.jpg", + DEMO_IMAGE_DIR "gallery-large-12.jpg", + DEMO_IMAGE_DIR "gallery-large-13.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "gallery-large-15.jpg", + DEMO_IMAGE_DIR "gallery-large-16.jpg", + DEMO_IMAGE_DIR "gallery-large-17.jpg", + DEMO_IMAGE_DIR "gallery-large-18.jpg", + DEMO_IMAGE_DIR "gallery-large-19.jpg", + DEMO_IMAGE_DIR "gallery-large-20.jpg", + DEMO_IMAGE_DIR "gallery-large-21.jpg", + + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-2.jpg", + DEMO_IMAGE_DIR "background-3.jpg", + DEMO_IMAGE_DIR "background-4.jpg", + DEMO_IMAGE_DIR "background-5.jpg", + DEMO_IMAGE_DIR "background-blocks.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", + + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-2.jpg", + DEMO_IMAGE_DIR "background-3.jpg", + DEMO_IMAGE_DIR "background-4.jpg", + DEMO_IMAGE_DIR "background-5.jpg", + DEMO_IMAGE_DIR "background-blocks.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", + + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg", + DEMO_IMAGE_DIR "book-landscape-cover.jpg", + DEMO_IMAGE_DIR "book-landscape-p1.jpg", + DEMO_IMAGE_DIR "book-landscape-p2.jpg", + + DEMO_IMAGE_DIR "book-portrait-cover.jpg", + DEMO_IMAGE_DIR "book-portrait-p1.jpg", + DEMO_IMAGE_DIR "book-portrait-p2.jpg", NULL }; const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; @@ -616,7 +616,7 @@ void RunTest( Application& application ) /** Entry point for Linux & Tizen applications */ int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp new file mode 100644 index 0000000..d47cb7c --- /dev/null +++ b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +using namespace Dali; + +class ImageViewAlphaBlendApp : public ConnectionTracker +{ +public: + ImageViewAlphaBlendApp( Application& application ) + : mApplication( application ), + mIndex(0u) + { + // Connect to the Application's Init signal + mApplication.InitSignal().Connect( this, &ImageViewAlphaBlendApp::Create ); + } + + ~ImageViewAlphaBlendApp() + { + // Nothing to do here; + } + +private: + // The Init signal is received once (only) during the Application lifetime + void Create( Application& application ) + { + // Get a handle to the stage + Stage stage = Stage::GetCurrent(); + stage.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent); + + Vector4 green0 = Vector4( 0.f, 1.f, 0.f, 0.25f ); + Vector4 green1 = Vector4( 0.f, 0.25f, 0.f, 0.25f ); + BufferImage redGreen0 = CreateBufferImage( Color::RED, green0 ); + BufferImage redGreen1 = CreateBufferImage( Color::RED, green1 ); + ResourceImage testImage = ResourceImage::New( DEMO_IMAGE_DIR "gallery-large-20.jpg" ); + float imageSize = 512.f; + + Toolkit::ImageView imageView0 = Toolkit::ImageView::New( testImage ); + imageView0.SetSize(imageSize, imageSize); + imageView0.SetParentOrigin( ParentOrigin::CENTER ); + imageView0.SetY( -imageSize*0.5f ); + stage.Add(imageView0); + Toolkit::ImageView imageView1 = Toolkit::ImageView::New( redGreen0 ); + imageView1.SetParentOrigin( ParentOrigin::CENTER ); + imageView1.SetSize(imageSize, imageSize); + imageView0.Add(imageView1); + + Toolkit::ImageView imageView2 = Toolkit::ImageView::New( testImage); + imageView2.SetSize(imageSize, imageSize); + imageView2.SetParentOrigin( ParentOrigin::CENTER ); + imageView2.SetY( imageSize*0.5f ); + stage.Add(imageView2); + Toolkit::ImageView imageView3 = Toolkit::ImageView::New( redGreen1); + imageView3.SetParentOrigin( ParentOrigin::CENTER ); + imageView3.SetSize(imageSize, imageSize); + imageView2.Add(imageView3); + + imageView2.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true ); + imageView3.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true ); + + Animation animation = Animation::New( 10.f ); + animation.AnimateTo(Property(imageView0, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 2.f, 8.f )); + animation.AnimateTo(Property(imageView2, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 2.f, 8.f )); + animation.SetLooping( true ); + animation.Play(); + } + + void OnKeyEvent(const KeyEvent& event) + { + if(event.state == KeyEvent::Down) + { + if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) + { + mApplication.Quit(); + } + } + } + + BufferImage CreateBufferImage( const Vector4& color1, const Vector4& color2 ) + { + BufferImage image = BufferImage::New( 2, 1, Pixel::RGBA8888 ); + PixelBuffer* pixelBuffer = image.GetBuffer(); + pixelBuffer[0]=0xFF * color1.x; + pixelBuffer[1]=0xFF * color1.y; + pixelBuffer[2]=0xFF * color1.z; + pixelBuffer[3]=0xFF * color1.w; + pixelBuffer[4]=0xFF * color2.x; + pixelBuffer[5]=0xFF * color2.y; + pixelBuffer[6]=0xFF * color2.z; + pixelBuffer[7]=0xFF * color2.w; + image.Update(); + return image; + } + + +private: + Application& mApplication; + unsigned int mIndex; +}; + +void RunTest( Application& application ) +{ + ImageViewAlphaBlendApp test( application ); + + application.MainLoop(); +} + +// Entry point for Linux & Tizen applications +// +int main( int argc, char **argv ) +{ + Application application = Application::New( &argc, &argv ); + + RunTest( application ); + + return 0; +} diff --git a/examples/image-view-pixel-area/image-view-pixel-area-example.cpp b/examples/image-view-pixel-area/image-view-pixel-area-example.cpp new file mode 100644 index 0000000..2805025 --- /dev/null +++ b/examples/image-view-pixel-area/image-view-pixel-area-example.cpp @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +using namespace Dali; + +namespace +{ +const char* IMAGE_PATH[] = { DEMO_IMAGE_DIR "gallery-large-7.jpg", + DEMO_IMAGE_DIR "gallery-large-12.jpg", + DEMO_IMAGE_DIR "gallery-large-18.jpg" }; + +const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*); +} + +class ImageViewPixelAreaApp : public ConnectionTracker +{ +public: + ImageViewPixelAreaApp( Application& application ) + : mApplication( application ), + mIndex(0u) + { + // Connect to the Application's Init signal + mApplication.InitSignal().Connect( this, &ImageViewPixelAreaApp::Create ); + } + + ~ImageViewPixelAreaApp() + { + // Nothing to do here; + } + +private: + // The Init signal is received once (only) during the Application lifetime + void Create( Application& application ) + { + // Get a handle to the stage + Stage stage = Stage::GetCurrent(); + stage.KeyEventSignal().Connect(this, &ImageViewPixelAreaApp::OnKeyEvent); + + ImageDimensions size( 510, 510 ); + float subSize = 170.f; + float relativeSubSize = 0.33; + Animation animation = Animation::New( 10.f ); + for( int i=0; i<3;i++ ) + for( int j=0; j<3; j++ ) + { + mImageView[i][j] = Toolkit::ImageView::New( IMAGE_PATH[mIndex], size ); + mImageView[i][j].SetParentOrigin( ParentOrigin::CENTER ); + mImageView[i][j].SetAnchorPoint(AnchorPoint::CENTER ); + mImageView[i][j].SetPosition( subSize*(i-1)*1.1f, subSize*(j-1)*1.1f ); + mImageView[i][j].SetSize( subSize, subSize ); + stage.Add(mImageView[i][j]); + + animation.AnimateTo( Property(mImageView[i][j], Toolkit::ImageView::Property::PIXEL_AREA), + Vector4( relativeSubSize*i, relativeSubSize*j, relativeSubSize, relativeSubSize ), + AlphaFunction::BOUNCE ); + } + animation.SetLooping( true ); + animation.Play(); + + // Respond to a click anywhere on the stage + stage.GetRootLayer().TouchedSignal().Connect( this, &ImageViewPixelAreaApp::OnTouch ); + } + + bool OnTouch( Actor actor, const TouchEvent& touch ) + { + const TouchPoint &point = touch.GetPoint(0); + if(point.state == TouchPoint::Down) + { + mIndex++; + for( int i=0; i<3;i++ ) + for( int j=0; j<3; j++ ) + { + mImageView[i][j].SetImage( IMAGE_PATH[mIndex%NUM_IMAGES] ); + } + } + return true; + } + + void OnKeyEvent(const KeyEvent& event) + { + if(event.state == KeyEvent::Down) + { + if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) + { + mApplication.Quit(); + } + } + } + +private: + Application& mApplication; + Toolkit::ImageView mImageView[3][3]; + unsigned int mIndex; +}; + +void RunTest( Application& application ) +{ + ImageViewPixelAreaApp test( application ); + + application.MainLoop(); +} + +// Entry point for Linux & Tizen applications +// +int main( int argc, char **argv ) +{ + Application application = Application::New( &argc, &argv ); + + RunTest( application ); + + return 0; +} diff --git a/examples/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp index 9f49294..db0704f 100644 --- a/examples/image-view/image-view-example.cpp +++ b/examples/image-view/image-view-example.cpp @@ -25,22 +25,22 @@ using namespace Dali; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE( "Image view" ); const char* IMAGE_PATH[] = { - DALI_IMAGE_DIR "blocks-ball.png", - DALI_IMAGE_DIR "gallery-small-23.jpg", - DALI_IMAGE_DIR "selection-popup-bg.2.9.png", - DALI_IMAGE_DIR "heartsframe.9.png", + DEMO_IMAGE_DIR "blocks-ball.png", + DEMO_IMAGE_DIR "gallery-small-23.jpg", + DEMO_IMAGE_DIR "selection-popup-bg.2.9.png", + DEMO_IMAGE_DIR "heartsframe.9.png", }; const char* RESOURCE_IMAGE_PATH[] = { - DALI_IMAGE_DIR "contacts-image.png", - DALI_IMAGE_DIR "gallery-small-27.jpg", - DALI_IMAGE_DIR "selection-popup-bg.8.9.png", - DALI_IMAGE_DIR "heartsframe.9.png", + DEMO_IMAGE_DIR "contacts-image.png", + DEMO_IMAGE_DIR "gallery-small-27.jpg", + DEMO_IMAGE_DIR "selection-popup-bg.8.9.png", + DEMO_IMAGE_DIR "heartsframe.9.png", }; const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*); @@ -265,7 +265,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 908c6b0..c435604 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -37,80 +37,80 @@ enum AllImagesLayouts }; const char* IMAGE_PATHS[] = { - DALI_IMAGE_DIR "gallery-medium-1.jpg", - DALI_IMAGE_DIR "gallery-medium-2.jpg", - DALI_IMAGE_DIR "gallery-medium-3.jpg", - DALI_IMAGE_DIR "gallery-medium-4.jpg", - DALI_IMAGE_DIR "gallery-medium-5.jpg", - DALI_IMAGE_DIR "gallery-medium-6.jpg", - DALI_IMAGE_DIR "gallery-medium-7.jpg", - DALI_IMAGE_DIR "gallery-medium-8.jpg", - DALI_IMAGE_DIR "gallery-medium-9.jpg", - DALI_IMAGE_DIR "gallery-medium-10.jpg", - DALI_IMAGE_DIR "gallery-medium-11.jpg", - DALI_IMAGE_DIR "gallery-medium-12.jpg", - DALI_IMAGE_DIR "gallery-medium-13.jpg", - DALI_IMAGE_DIR "gallery-medium-14.jpg", - DALI_IMAGE_DIR "gallery-medium-15.jpg", - DALI_IMAGE_DIR "gallery-medium-16.jpg", - DALI_IMAGE_DIR "gallery-medium-17.jpg", - DALI_IMAGE_DIR "gallery-medium-18.jpg", - DALI_IMAGE_DIR "gallery-medium-19.jpg", - DALI_IMAGE_DIR "gallery-medium-20.jpg", - DALI_IMAGE_DIR "gallery-medium-21.jpg", - DALI_IMAGE_DIR "gallery-medium-22.jpg", - DALI_IMAGE_DIR "gallery-medium-23.jpg", - DALI_IMAGE_DIR "gallery-medium-24.jpg", - DALI_IMAGE_DIR "gallery-medium-25.jpg", - DALI_IMAGE_DIR "gallery-medium-26.jpg", - DALI_IMAGE_DIR "gallery-medium-27.jpg", - DALI_IMAGE_DIR "gallery-medium-28.jpg", - DALI_IMAGE_DIR "gallery-medium-29.jpg", - DALI_IMAGE_DIR "gallery-medium-30.jpg", - DALI_IMAGE_DIR "gallery-medium-31.jpg", - DALI_IMAGE_DIR "gallery-medium-32.jpg", - DALI_IMAGE_DIR "gallery-medium-33.jpg", - DALI_IMAGE_DIR "gallery-medium-34.jpg", - DALI_IMAGE_DIR "gallery-medium-35.jpg", - DALI_IMAGE_DIR "gallery-medium-36.jpg", - DALI_IMAGE_DIR "gallery-medium-37.jpg", - DALI_IMAGE_DIR "gallery-medium-38.jpg", - DALI_IMAGE_DIR "gallery-medium-39.jpg", - DALI_IMAGE_DIR "gallery-medium-40.jpg", - DALI_IMAGE_DIR "gallery-medium-41.jpg", - DALI_IMAGE_DIR "gallery-medium-42.jpg", - DALI_IMAGE_DIR "gallery-medium-43.jpg", - DALI_IMAGE_DIR "gallery-medium-44.jpg", - DALI_IMAGE_DIR "gallery-medium-45.jpg", - DALI_IMAGE_DIR "gallery-medium-46.jpg", - DALI_IMAGE_DIR "gallery-medium-47.jpg", - DALI_IMAGE_DIR "gallery-medium-48.jpg", - DALI_IMAGE_DIR "gallery-medium-49.jpg", - DALI_IMAGE_DIR "gallery-medium-50.jpg", - DALI_IMAGE_DIR "gallery-medium-51.jpg", - DALI_IMAGE_DIR "gallery-medium-52.jpg", - DALI_IMAGE_DIR "gallery-medium-53.jpg", + DEMO_IMAGE_DIR "gallery-medium-1.jpg", + DEMO_IMAGE_DIR "gallery-medium-2.jpg", + DEMO_IMAGE_DIR "gallery-medium-3.jpg", + DEMO_IMAGE_DIR "gallery-medium-4.jpg", + DEMO_IMAGE_DIR "gallery-medium-5.jpg", + DEMO_IMAGE_DIR "gallery-medium-6.jpg", + DEMO_IMAGE_DIR "gallery-medium-7.jpg", + DEMO_IMAGE_DIR "gallery-medium-8.jpg", + DEMO_IMAGE_DIR "gallery-medium-9.jpg", + DEMO_IMAGE_DIR "gallery-medium-10.jpg", + DEMO_IMAGE_DIR "gallery-medium-11.jpg", + DEMO_IMAGE_DIR "gallery-medium-12.jpg", + DEMO_IMAGE_DIR "gallery-medium-13.jpg", + DEMO_IMAGE_DIR "gallery-medium-14.jpg", + DEMO_IMAGE_DIR "gallery-medium-15.jpg", + DEMO_IMAGE_DIR "gallery-medium-16.jpg", + DEMO_IMAGE_DIR "gallery-medium-17.jpg", + DEMO_IMAGE_DIR "gallery-medium-18.jpg", + DEMO_IMAGE_DIR "gallery-medium-19.jpg", + DEMO_IMAGE_DIR "gallery-medium-20.jpg", + DEMO_IMAGE_DIR "gallery-medium-21.jpg", + DEMO_IMAGE_DIR "gallery-medium-22.jpg", + DEMO_IMAGE_DIR "gallery-medium-23.jpg", + DEMO_IMAGE_DIR "gallery-medium-24.jpg", + DEMO_IMAGE_DIR "gallery-medium-25.jpg", + DEMO_IMAGE_DIR "gallery-medium-26.jpg", + DEMO_IMAGE_DIR "gallery-medium-27.jpg", + DEMO_IMAGE_DIR "gallery-medium-28.jpg", + DEMO_IMAGE_DIR "gallery-medium-29.jpg", + DEMO_IMAGE_DIR "gallery-medium-30.jpg", + DEMO_IMAGE_DIR "gallery-medium-31.jpg", + DEMO_IMAGE_DIR "gallery-medium-32.jpg", + DEMO_IMAGE_DIR "gallery-medium-33.jpg", + DEMO_IMAGE_DIR "gallery-medium-34.jpg", + DEMO_IMAGE_DIR "gallery-medium-35.jpg", + DEMO_IMAGE_DIR "gallery-medium-36.jpg", + DEMO_IMAGE_DIR "gallery-medium-37.jpg", + DEMO_IMAGE_DIR "gallery-medium-38.jpg", + DEMO_IMAGE_DIR "gallery-medium-39.jpg", + DEMO_IMAGE_DIR "gallery-medium-40.jpg", + DEMO_IMAGE_DIR "gallery-medium-41.jpg", + DEMO_IMAGE_DIR "gallery-medium-42.jpg", + DEMO_IMAGE_DIR "gallery-medium-43.jpg", + DEMO_IMAGE_DIR "gallery-medium-44.jpg", + DEMO_IMAGE_DIR "gallery-medium-45.jpg", + DEMO_IMAGE_DIR "gallery-medium-46.jpg", + DEMO_IMAGE_DIR "gallery-medium-47.jpg", + DEMO_IMAGE_DIR "gallery-medium-48.jpg", + DEMO_IMAGE_DIR "gallery-medium-49.jpg", + DEMO_IMAGE_DIR "gallery-medium-50.jpg", + DEMO_IMAGE_DIR "gallery-medium-51.jpg", + DEMO_IMAGE_DIR "gallery-medium-52.jpg", + DEMO_IMAGE_DIR "gallery-medium-53.jpg", }; const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*); const char* BACKGROUND_IMAGE( "" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char* EDIT_IMAGE( DALI_IMAGE_DIR "icon-edit.png" ); -const char* EDIT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-edit-selected.png" ); -const char* SPIRAL_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png" ); -const char* SPIRAL_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-spiral-selected.png" ); -const char* GRID_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-grid.png" ); -const char* GRID_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-grid-selected.png" ); -const char* DEPTH_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-depth.png" ); -const char* DEPTH_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-depth-selected.png" ); -const char* DELETE_IMAGE( DALI_IMAGE_DIR "icon-delete.png" ); -const char* DELETE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-delete-selected.png" ); -const char* REPLACE_IMAGE( DALI_IMAGE_DIR "icon-replace.png" ); -const char* REPLACE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); -const char* INSERT_IMAGE( DALI_IMAGE_DIR "icon-insert.png" ); -const char* INSERT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-insert-selected.png" ); -const char* SELECTED_IMAGE( DALI_IMAGE_DIR "item-select-check.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* EDIT_IMAGE( DEMO_IMAGE_DIR "icon-edit.png" ); +const char* EDIT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-edit-selected.png" ); +const char* SPIRAL_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png" ); +const char* SPIRAL_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-spiral-selected.png" ); +const char* GRID_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png" ); +const char* GRID_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-grid-selected.png" ); +const char* DEPTH_LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png" ); +const char* DEPTH_LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-item-view-layout-depth-selected.png" ); +const char* DELETE_IMAGE( DEMO_IMAGE_DIR "icon-delete.png" ); +const char* DELETE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-delete-selected.png" ); +const char* REPLACE_IMAGE( DEMO_IMAGE_DIR "icon-replace.png" ); +const char* REPLACE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" ); +const char* INSERT_IMAGE( DEMO_IMAGE_DIR "icon-insert.png" ); +const char* INSERT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-insert-selected.png" ); +const char* SELECTED_IMAGE( DEMO_IMAGE_DIR "item-select-check.png" ); const char* APPLICATION_TITLE( "ItemView" ); const char* SPIRAL_LABEL("Spiral"); @@ -984,7 +984,7 @@ void RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index 2fc5d94..ac9b402 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -26,8 +26,8 @@ using namespace Dali; namespace { -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" ); -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" ); +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" ); #define MAKE_SHADER(A)#A diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp index ee4643d..46969e0 100644 --- a/examples/logging/logging-example.cpp +++ b/examples/logging/logging-example.cpp @@ -44,8 +44,8 @@ using namespace Dali; namespace { -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg"; -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg"; +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png"; const char* const TOOLBAR_TITLE = "Logging"; //const int TOOLBAR_HEIGHT = 62; @@ -712,7 +712,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index f781d70..4433e59 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -26,8 +26,8 @@ using namespace Dali; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-magnifier.jpg" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-magnifier.jpg" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE( "Magnifier Example" ); const Vector3 MAGNIFIER_SIZE(0.25f, 0.25f, 0.0f); ///< Magnifier sides should be 25% of the width of the stage const float ANIMATION_DURATION(60.0f); ///< Run animation for a minute before repeating. @@ -413,7 +413,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp index 354364f..9e6da9b 100644 --- a/examples/mesh-sorting/mesh-sorting-example.cpp +++ b/examples/mesh-sorting/mesh-sorting-example.cpp @@ -32,12 +32,12 @@ namespace const char* MATERIAL_SAMPLES[] = { - DALI_IMAGE_DIR "people-medium-1.jpg", - DALI_IMAGE_DIR "people-medium-4.jpg", - DALI_IMAGE_DIR "people-medium-11.jpg", - DALI_IMAGE_DIR "people-small-16.jpg", - DALI_IMAGE_DIR "people-medium-15.jpg", - DALI_IMAGE_DIR "people-medium-6.jpg", + DEMO_IMAGE_DIR "people-medium-1.jpg", + DEMO_IMAGE_DIR "people-medium-4.jpg", + DEMO_IMAGE_DIR "people-medium-11.jpg", + DEMO_IMAGE_DIR "people-small-16.jpg", + DEMO_IMAGE_DIR "people-medium-15.jpg", + DEMO_IMAGE_DIR "people-medium-6.jpg", }; const unsigned int NUMBER_OF_SAMPLES(sizeof(MATERIAL_SAMPLES)/sizeof(const char*)); diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 1c76add..6aea940 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -31,8 +31,8 @@ using namespace Dali::Toolkit; namespace { -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const float GRAVITY_X(0); const float GRAVITY_Y(-0.09); @@ -299,7 +299,7 @@ private: //----------------------------------------------------------------------------------------------- // -// IMPLEMENTATION +// IMPLEMENTATION // //---------------- diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 94fd5b6..bd4c296 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -27,8 +27,8 @@ using namespace Dali::Toolkit; namespace { -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const float GRAVITY_X(0); const float GRAVITY_Y(-0.09); @@ -230,7 +230,7 @@ private: //----------------------------------------------------------------------------------------------- // -// IMPLEMENTATION +// IMPLEMENTATION // //---------------- @@ -875,4 +875,3 @@ int main( int argc, char **argv ) return 0; } - diff --git a/examples/model3d-view/model3d-view-example.cpp b/examples/model3d-view/model3d-view-example.cpp index fc056b5..1602180 100644 --- a/examples/model3d-view/model3d-view-example.cpp +++ b/examples/model3d-view/model3d-view-example.cpp @@ -25,20 +25,20 @@ namespace const int MODEL_NUMBER(3); const char * const MODEL_FILE[] = { - DALI_MODEL_DIR "Dino.obj", - DALI_MODEL_DIR "ToyRobot-Metal.obj", - DALI_MODEL_DIR "Toyrobot-Plastic.obj" + DEMO_MODEL_DIR "Dino.obj", + DEMO_MODEL_DIR "ToyRobot-Metal.obj", + DEMO_MODEL_DIR "Toyrobot-Plastic.obj" }; const char * const MATERIAL_FILE[] = { - DALI_MODEL_DIR "Dino.mtl", - DALI_MODEL_DIR "ToyRobot-Metal.mtl", - DALI_MODEL_DIR "Toyrobot-Plastic.mtl" + DEMO_MODEL_DIR "Dino.mtl", + DEMO_MODEL_DIR "ToyRobot-Metal.mtl", + DEMO_MODEL_DIR "Toyrobot-Plastic.mtl" }; -const char * const IMAGE_PATH( DALI_IMAGE_DIR "" ); +const char * const IMAGE_PATH( DEMO_IMAGE_DIR "" ); -const char * BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-1.jpg"); +const char * BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-1.jpg"); } diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index 2737885..4f22286 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -54,11 +54,11 @@ const float MOTION_BLUR_ACTOR_HEIGHT = 112; const unsigned int MOTION_BLUR_NUM_SAMPLES = 8; const int MOTION_BLUR_NUM_ACTOR_IMAGES = 5; -const char* MOTION_BLUR_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" ); -const char* MOTION_BLUR_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" ); -const char* MOTION_BLUR_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" ); -const char* MOTION_BLUR_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" ); -const char* MOTION_BLUR_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-1.jpg" ); +const char* MOTION_BLUR_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" ); +const char* MOTION_BLUR_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" ); +const char* MOTION_BLUR_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" ); +const char* MOTION_BLUR_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" ); +const char* MOTION_BLUR_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-1.jpg" ); const char* MOTION_BLUR_ACTOR_IMAGES[] = { MOTION_BLUR_ACTOR_IMAGE1, @@ -72,16 +72,16 @@ const int NUM_ACTOR_ANIMATIONS = 4; const int NUM_CAMERA_ANIMATIONS = 2; -const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png"; +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png"; -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); -const char* LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); const char* APPLICATION_TITLE( "Motion Blur" ); -const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" ); -const char* EFFECTS_OFF_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-off-selected.png" ); -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" ); -const char* EFFECTS_ON_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-on-selected.png" ); +const char* EFFECTS_OFF_ICON( DEMO_IMAGE_DIR "icon-effects-off.png" ); +const char* EFFECTS_OFF_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-off-selected.png" ); +const char* EFFECTS_ON_ICON( DEMO_IMAGE_DIR "icon-effects-on.png" ); +const char* EFFECTS_ON_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-on-selected.png" ); const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons @@ -560,7 +560,7 @@ void RunTest(Application& app) // int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index 0a06417..15176b2 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -40,11 +40,11 @@ const float MOTION_STRETCH_ACTOR_WIDTH = 256; const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // "" const int MOTION_STRETCH_NUM_ACTOR_IMAGES = 5; -const char* MOTION_STRETCH_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-5.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-5.jpg" ); const char* MOTION_STRETCH_ACTOR_IMAGES[] = { MOTION_STRETCH_ACTOR_IMAGE1, @@ -58,16 +58,16 @@ const int NUM_ACTOR_ANIMATIONS = 4; const int NUM_CAMERA_ANIMATIONS = 2; -const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png"; +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png"; -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); -const char* LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); const char* APPLICATION_TITLE( "Motion Stretch" ); -const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" ); -const char* EFFECTS_OFF_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-off-selected.png" ); -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" ); -const char* EFFECTS_ON_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-on-selected.png" ); +const char* EFFECTS_OFF_ICON( DEMO_IMAGE_DIR "icon-effects-off.png" ); +const char* EFFECTS_OFF_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-off-selected.png" ); +const char* EFFECTS_ON_ICON( DEMO_IMAGE_DIR "icon-effects-on.png" ); +const char* EFFECTS_ON_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-on-selected.png" ); // These values depend on the button background image const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f ); @@ -443,7 +443,7 @@ void RunTest(Application& app) // int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index 0ec445a..8dff27d 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -32,13 +32,13 @@ class NewWindowController; namespace { -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" ); -const char * const LOSE_CONTEXT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-cluster-wobble-selected.png" ); -const char * const BASE_IMAGE( DALI_IMAGE_DIR "gallery-large-14.jpg" ); -const char * const EFFECT_IMAGE( DALI_IMAGE_DIR "gallery-large-18.jpg" ); -const char * const LOGO_IMAGE(DALI_IMAGE_DIR "dali-logo.png"); +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-2.jpg" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" ); +const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" ); +const char * const BASE_IMAGE( DEMO_IMAGE_DIR "gallery-large-14.jpg" ); +const char * const EFFECT_IMAGE( DEMO_IMAGE_DIR "gallery-large-18.jpg" ); +const char * const LOGO_IMAGE(DEMO_IMAGE_DIR "dali-logo.png"); const float EXPLOSION_DURATION(1.2f); const unsigned int EMIT_INTERVAL_IN_MS(40); @@ -241,7 +241,7 @@ void NewWindowController::Destroy( Application& app ) void NewWindowController::AddBubbles( Actor& parentActor, const Vector2& stageSize) { mEmitter = Toolkit::BubbleEmitter::New( stageSize, - ResourceImage::New( DALI_IMAGE_DIR "bubble-ball.png" ), + ResourceImage::New( DEMO_IMAGE_DIR "bubble-ball.png" ), 200, Vector2( 5.0f, 5.0f ) ); Image background = ResourceImage::New(BACKGROUND_IMAGE); @@ -563,7 +563,7 @@ void RunTest(Application& app) // int main(int argc, char **argv) { - gApplication = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + gApplication = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(gApplication); return 0; diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp index 945879c..d53cfa5 100644 --- a/examples/page-turn-view/page-turn-view-example.cpp +++ b/examples/page-turn-view/page-turn-view-example.cpp @@ -31,37 +31,37 @@ using namespace Dali::Toolkit; // LOCAL STUFF namespace { -const char* const CHANGE_IMAGE_ICON(DALI_IMAGE_DIR "icon-change.png"); -const char* const CHANGE_IMAGE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char* const CHANGE_IMAGE_ICON(DEMO_IMAGE_DIR "icon-change.png"); +const char* const CHANGE_IMAGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); // The content amount of one page between portrait and landscape view are different // set a ratio to modify the current page number when the rotation is changed const float PAGE_NUMBER_CORRESPONDING_RATIO(1.25f); -const char* BOOK_COVER_PORTRAIT = ( DALI_IMAGE_DIR "book-portrait-cover.jpg" ); -const char* BOOK_COVER_LANDSCAPE = ( DALI_IMAGE_DIR "book-landscape-cover.jpg" ); -const char* BOOK_COVER_BACK_LANDSCAPE = ( DALI_IMAGE_DIR "book-landscape-cover-back.jpg" ); +const char* BOOK_COVER_PORTRAIT = ( DEMO_IMAGE_DIR "book-portrait-cover.jpg" ); +const char* BOOK_COVER_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover.jpg" ); +const char* BOOK_COVER_BACK_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover-back.jpg" ); const char* PAGE_IMAGES_PORTRAIT[] = { - DALI_IMAGE_DIR "book-portrait-p1.jpg", - DALI_IMAGE_DIR "book-portrait-p2.jpg", - DALI_IMAGE_DIR "book-portrait-p3.jpg", - DALI_IMAGE_DIR "book-portrait-p4.jpg", - DALI_IMAGE_DIR "book-portrait-p5.jpg" + DEMO_IMAGE_DIR "book-portrait-p1.jpg", + DEMO_IMAGE_DIR "book-portrait-p2.jpg", + DEMO_IMAGE_DIR "book-portrait-p3.jpg", + DEMO_IMAGE_DIR "book-portrait-p4.jpg", + DEMO_IMAGE_DIR "book-portrait-p5.jpg" }; const unsigned int NUMBER_OF_PORTRAIT_IMAGE( sizeof(PAGE_IMAGES_PORTRAIT) / sizeof(PAGE_IMAGES_PORTRAIT[0]) ); const char* PAGE_IMAGES_LANDSCAPE[] = { - DALI_IMAGE_DIR "book-landscape-p1.jpg", - DALI_IMAGE_DIR "book-landscape-p2.jpg", - DALI_IMAGE_DIR "book-landscape-p3.jpg", - DALI_IMAGE_DIR "book-landscape-p4.jpg", - DALI_IMAGE_DIR "book-landscape-p5.jpg", - DALI_IMAGE_DIR "book-landscape-p6.jpg", - DALI_IMAGE_DIR "book-landscape-p7.jpg", - DALI_IMAGE_DIR "book-landscape-p8.jpg" + DEMO_IMAGE_DIR "book-landscape-p1.jpg", + DEMO_IMAGE_DIR "book-landscape-p2.jpg", + DEMO_IMAGE_DIR "book-landscape-p3.jpg", + DEMO_IMAGE_DIR "book-landscape-p4.jpg", + DEMO_IMAGE_DIR "book-landscape-p5.jpg", + DEMO_IMAGE_DIR "book-landscape-p6.jpg", + DEMO_IMAGE_DIR "book-landscape-p7.jpg", + DEMO_IMAGE_DIR "book-landscape-p8.jpg" }; const unsigned int NUMBER_OF_LANDSCAPE_IMAGE( sizeof(PAGE_IMAGES_LANDSCAPE) / sizeof(PAGE_IMAGES_LANDSCAPE[0]) ); @@ -347,11 +347,10 @@ void PageTurnController::OnPageFinishedPan( PageTurnView pageTurnView ) // Entry point for applications int main( int argc, char **argv ) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); PageTurnController test ( app ); app.MainLoop(); return 0; } - diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index 0a96d9c..cc14999 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -26,8 +26,8 @@ using namespace Dali; namespace { -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" ); -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" ); +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" ); #define MAKE_SHADER(A)#A diff --git a/examples/popup/popup-example.cpp b/examples/popup/popup-example.cpp index 1d31bbc..4582f81 100644 --- a/examples/popup/popup-example.cpp +++ b/examples/popup/popup-example.cpp @@ -34,15 +34,15 @@ struct ButtonItem namespace { -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg"; -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg"; +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png"; const char* const TOOLBAR_TITLE = "Popup"; -const char* CONTEXT_DISABLED_ICON_IMAGE = DALI_IMAGE_DIR "icon-scroll-view-carousel.png"; -const char* CONTEXT_ENABLED_ICON_IMAGE = DALI_IMAGE_DIR "icon-scroll-view-spiral.png"; -const char* ANIMATION_FADE_ICON_IMAGE = DALI_IMAGE_DIR "icon-effects-off.png"; -const char* ANIMATION_ZOOM_ICON_IMAGE = DALI_IMAGE_DIR "icon-effects-on.png"; +const char* CONTEXT_DISABLED_ICON_IMAGE = DEMO_IMAGE_DIR "icon-scroll-view-carousel.png"; +const char* CONTEXT_ENABLED_ICON_IMAGE = DEMO_IMAGE_DIR "icon-scroll-view-spiral.png"; +const char* ANIMATION_FADE_ICON_IMAGE = DEMO_IMAGE_DIR "icon-effects-off.png"; +const char* ANIMATION_ZOOM_ICON_IMAGE = DEMO_IMAGE_DIR "icon-effects-on.png"; const char* const POPUP_BUTTON_TITLE_ID = "POPUP_BUTTON_TITLE"; const char* const POPUP_BUTTON_BUTTONS_1_ID = "POPUP_BUTTON_BUTTONS_1"; @@ -61,11 +61,11 @@ const char* const POPUP_CONTROL_OK_NAME = "controlOk"; const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel"; 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."; -const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg"; -const char* const IMAGE2 = DALI_IMAGE_DIR "background-magnifier.jpg"; +const char* const IMAGE1 = DEMO_IMAGE_DIR "gallery-medium-5.jpg"; +const char* const IMAGE2 = DEMO_IMAGE_DIR "background-magnifier.jpg"; // Control area image. -const char* DEFAULT_CONTROL_AREA_IMAGE_PATH = DALI_IMAGE_DIR "popup_button_background.9.png"; ///< Control area image for the popup. +const char* DEFAULT_CONTROL_AREA_IMAGE_PATH = DEMO_IMAGE_DIR "popup_button_background.9.png"; ///< Control area image for the popup. const ButtonItem POPUP_BUTTON_ITEMS[] = { { POPUP_BUTTON_COMPLEX_ID, "Complex" }, @@ -733,7 +733,7 @@ void RunTest( Application& application ) // Entry point for Linux & SLP applications int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp index 9f5b9fa..142523f 100644 --- a/examples/radial-menu/radial-menu-example.cpp +++ b/examples/radial-menu/radial-menu-example.cpp @@ -26,16 +26,16 @@ using namespace Dali::Toolkit; namespace { -const char* TEST_OUTER_RING_FILENAME = DALI_IMAGE_DIR "layer2.png"; // Image to be masked -const char* TEST_INNER_RING_FILENAME = DALI_IMAGE_DIR "layer1.png"; // Image to be masked -const char* TEST_MENU_FILENAME = DALI_IMAGE_DIR "layer3.png"; // Image to be masked -const char* TEST_DIAL_FILENAME = DALI_IMAGE_DIR "layer4.png"; // Image to be masked -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); // Background for toolbar +const char* TEST_OUTER_RING_FILENAME = DEMO_IMAGE_DIR "layer2.png"; // Image to be masked +const char* TEST_INNER_RING_FILENAME = DEMO_IMAGE_DIR "layer1.png"; // Image to be masked +const char* TEST_MENU_FILENAME = DEMO_IMAGE_DIR "layer3.png"; // Image to be masked +const char* TEST_DIAL_FILENAME = DEMO_IMAGE_DIR "layer4.png"; // Image to be masked +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); // Background for toolbar const char* APPLICATION_TITLE( "Radial Menu" ); -const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" ); -const char * const PLAY_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" ); -const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" ); -const char * const STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" ); +const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" ); +const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" ); +const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" ); +const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" ); } @@ -301,7 +301,7 @@ void RunTest(Application app) // Entry point for Linux & Tizen applications int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index 2027b9b..b1983d2 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -32,25 +32,25 @@ using namespace Dali; namespace { const char * const APPLICATION_TITLE( "Refraction Effect" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char * const CHANGE_TEXTURE_ICON( DALI_IMAGE_DIR "icon-change.png" ); -const char * const CHANGE_TEXTURE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); -const char * const CHANGE_MESH_ICON( DALI_IMAGE_DIR "icon-replace.png" ); -const char * const CHANGE_MESH_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char * const CHANGE_TEXTURE_ICON( DEMO_IMAGE_DIR "icon-change.png" ); +const char * const CHANGE_TEXTURE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); +const char * const CHANGE_MESH_ICON( DEMO_IMAGE_DIR "icon-replace.png" ); +const char * const CHANGE_MESH_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" ); const char* MESH_FILES[] = { - DALI_MODEL_DIR "surface_pattern_v01.obj", - DALI_MODEL_DIR "surface_pattern_v02.obj" + DEMO_MODEL_DIR "surface_pattern_v01.obj", + DEMO_MODEL_DIR "surface_pattern_v02.obj" }; const unsigned int NUM_MESH_FILES( sizeof( MESH_FILES ) / sizeof( MESH_FILES[0] ) ); const char* TEXTURE_IMAGES[]= { - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-2.jpg", - DALI_IMAGE_DIR "background-3.jpg", - DALI_IMAGE_DIR "background-4.jpg" + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-2.jpg", + DEMO_IMAGE_DIR "background-3.jpg", + DEMO_IMAGE_DIR "background-4.jpg" }; const unsigned int NUM_TEXTURE_IMAGES( sizeof( TEXTURE_IMAGES ) / sizeof( TEXTURE_IMAGES[0] ) ); @@ -599,7 +599,7 @@ RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/scripting/launcher.cpp b/examples/scripting/launcher.cpp index 5c81a9b..2362696 100644 --- a/examples/scripting/launcher.cpp +++ b/examples/scripting/launcher.cpp @@ -79,9 +79,9 @@ void Launcher::Create( Dali::Application& application ) mBuilder = Toolkit::Builder::New(); Property::Map defaultDirs; - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR; - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR; - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR; + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR; + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR; mBuilder.AddConstants( defaultDirs ); std::string json_data(GetFileContents( mJSONFileName )); diff --git a/examples/scripting/scripting-example.cpp b/examples/scripting/scripting-example.cpp index 9db48f9..00bfcd3 100644 --- a/examples/scripting/scripting-example.cpp +++ b/examples/scripting/scripting-example.cpp @@ -86,7 +86,7 @@ int main( int argc, char* argv[] ) } - Launcher daliApplication( Dali::Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ), jSONFileName, javaScriptFileName ); + Launcher daliApplication( Dali::Application::New( &argc, &argv, DEMO_THEME_PATH ), jSONFileName, javaScriptFileName ); daliApplication.MainLoop(); diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index 9bdb300..ed8e699 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -28,11 +28,11 @@ using namespace Dali::Toolkit; namespace { -const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-default.png" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-default.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const APPLICATION_TITLE( "ScrollView" ); -const char * const EFFECT_CAROUSEL_IMAGE( DALI_IMAGE_DIR "icon-scroll-view-carousel.png" ); -const char * const EFFECT_CAROUSEL_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-scroll-view-carousel-selected.png" ); +const char * const EFFECT_CAROUSEL_IMAGE( DEMO_IMAGE_DIR "icon-scroll-view-carousel.png" ); +const char * const EFFECT_CAROUSEL_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-scroll-view-carousel-selected.png" ); const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f); @@ -44,59 +44,59 @@ const char* EFFECT_MODE_NAME[] = { }; const char * const IMAGE_PATHS[] = { - DALI_IMAGE_DIR "gallery-medium-1.jpg", - DALI_IMAGE_DIR "gallery-medium-2.jpg", - DALI_IMAGE_DIR "gallery-medium-3.jpg", - DALI_IMAGE_DIR "gallery-medium-4.jpg", - DALI_IMAGE_DIR "gallery-medium-5.jpg", - DALI_IMAGE_DIR "gallery-medium-6.jpg", - DALI_IMAGE_DIR "gallery-medium-7.jpg", - DALI_IMAGE_DIR "gallery-medium-8.jpg", - DALI_IMAGE_DIR "gallery-medium-9.jpg", - DALI_IMAGE_DIR "gallery-medium-10.jpg", - DALI_IMAGE_DIR "gallery-medium-11.jpg", - DALI_IMAGE_DIR "gallery-medium-12.jpg", - DALI_IMAGE_DIR "gallery-medium-13.jpg", - DALI_IMAGE_DIR "gallery-medium-14.jpg", - DALI_IMAGE_DIR "gallery-medium-15.jpg", - DALI_IMAGE_DIR "gallery-medium-16.jpg", - DALI_IMAGE_DIR "gallery-medium-17.jpg", - DALI_IMAGE_DIR "gallery-medium-18.jpg", - DALI_IMAGE_DIR "gallery-medium-19.jpg", - DALI_IMAGE_DIR "gallery-medium-20.jpg", - DALI_IMAGE_DIR "gallery-medium-21.jpg", - DALI_IMAGE_DIR "gallery-medium-22.jpg", - DALI_IMAGE_DIR "gallery-medium-23.jpg", - DALI_IMAGE_DIR "gallery-medium-24.jpg", - DALI_IMAGE_DIR "gallery-medium-25.jpg", - DALI_IMAGE_DIR "gallery-medium-26.jpg", - DALI_IMAGE_DIR "gallery-medium-27.jpg", - DALI_IMAGE_DIR "gallery-medium-28.jpg", - DALI_IMAGE_DIR "gallery-medium-29.jpg", - DALI_IMAGE_DIR "gallery-medium-30.jpg", - DALI_IMAGE_DIR "gallery-medium-31.jpg", - DALI_IMAGE_DIR "gallery-medium-32.jpg", - DALI_IMAGE_DIR "gallery-medium-33.jpg", - DALI_IMAGE_DIR "gallery-medium-34.jpg", - DALI_IMAGE_DIR "gallery-medium-35.jpg", - DALI_IMAGE_DIR "gallery-medium-36.jpg", - DALI_IMAGE_DIR "gallery-medium-37.jpg", - DALI_IMAGE_DIR "gallery-medium-38.jpg", - DALI_IMAGE_DIR "gallery-medium-39.jpg", - DALI_IMAGE_DIR "gallery-medium-40.jpg", - DALI_IMAGE_DIR "gallery-medium-41.jpg", - DALI_IMAGE_DIR "gallery-medium-42.jpg", - DALI_IMAGE_DIR "gallery-medium-43.jpg", - DALI_IMAGE_DIR "gallery-medium-44.jpg", - DALI_IMAGE_DIR "gallery-medium-45.jpg", - DALI_IMAGE_DIR "gallery-medium-46.jpg", - DALI_IMAGE_DIR "gallery-medium-47.jpg", - DALI_IMAGE_DIR "gallery-medium-48.jpg", - DALI_IMAGE_DIR "gallery-medium-49.jpg", - DALI_IMAGE_DIR "gallery-medium-50.jpg", - DALI_IMAGE_DIR "gallery-medium-51.jpg", - DALI_IMAGE_DIR "gallery-medium-52.jpg", - DALI_IMAGE_DIR "gallery-medium-53.jpg", + DEMO_IMAGE_DIR "gallery-medium-1.jpg", + DEMO_IMAGE_DIR "gallery-medium-2.jpg", + DEMO_IMAGE_DIR "gallery-medium-3.jpg", + DEMO_IMAGE_DIR "gallery-medium-4.jpg", + DEMO_IMAGE_DIR "gallery-medium-5.jpg", + DEMO_IMAGE_DIR "gallery-medium-6.jpg", + DEMO_IMAGE_DIR "gallery-medium-7.jpg", + DEMO_IMAGE_DIR "gallery-medium-8.jpg", + DEMO_IMAGE_DIR "gallery-medium-9.jpg", + DEMO_IMAGE_DIR "gallery-medium-10.jpg", + DEMO_IMAGE_DIR "gallery-medium-11.jpg", + DEMO_IMAGE_DIR "gallery-medium-12.jpg", + DEMO_IMAGE_DIR "gallery-medium-13.jpg", + DEMO_IMAGE_DIR "gallery-medium-14.jpg", + DEMO_IMAGE_DIR "gallery-medium-15.jpg", + DEMO_IMAGE_DIR "gallery-medium-16.jpg", + DEMO_IMAGE_DIR "gallery-medium-17.jpg", + DEMO_IMAGE_DIR "gallery-medium-18.jpg", + DEMO_IMAGE_DIR "gallery-medium-19.jpg", + DEMO_IMAGE_DIR "gallery-medium-20.jpg", + DEMO_IMAGE_DIR "gallery-medium-21.jpg", + DEMO_IMAGE_DIR "gallery-medium-22.jpg", + DEMO_IMAGE_DIR "gallery-medium-23.jpg", + DEMO_IMAGE_DIR "gallery-medium-24.jpg", + DEMO_IMAGE_DIR "gallery-medium-25.jpg", + DEMO_IMAGE_DIR "gallery-medium-26.jpg", + DEMO_IMAGE_DIR "gallery-medium-27.jpg", + DEMO_IMAGE_DIR "gallery-medium-28.jpg", + DEMO_IMAGE_DIR "gallery-medium-29.jpg", + DEMO_IMAGE_DIR "gallery-medium-30.jpg", + DEMO_IMAGE_DIR "gallery-medium-31.jpg", + DEMO_IMAGE_DIR "gallery-medium-32.jpg", + DEMO_IMAGE_DIR "gallery-medium-33.jpg", + DEMO_IMAGE_DIR "gallery-medium-34.jpg", + DEMO_IMAGE_DIR "gallery-medium-35.jpg", + DEMO_IMAGE_DIR "gallery-medium-36.jpg", + DEMO_IMAGE_DIR "gallery-medium-37.jpg", + DEMO_IMAGE_DIR "gallery-medium-38.jpg", + DEMO_IMAGE_DIR "gallery-medium-39.jpg", + DEMO_IMAGE_DIR "gallery-medium-40.jpg", + DEMO_IMAGE_DIR "gallery-medium-41.jpg", + DEMO_IMAGE_DIR "gallery-medium-42.jpg", + DEMO_IMAGE_DIR "gallery-medium-43.jpg", + DEMO_IMAGE_DIR "gallery-medium-44.jpg", + DEMO_IMAGE_DIR "gallery-medium-45.jpg", + DEMO_IMAGE_DIR "gallery-medium-46.jpg", + DEMO_IMAGE_DIR "gallery-medium-47.jpg", + DEMO_IMAGE_DIR "gallery-medium-48.jpg", + DEMO_IMAGE_DIR "gallery-medium-49.jpg", + DEMO_IMAGE_DIR "gallery-medium-50.jpg", + DEMO_IMAGE_DIR "gallery-medium-51.jpg", + DEMO_IMAGE_DIR "gallery-medium-52.jpg", + DEMO_IMAGE_DIR "gallery-medium-53.jpg", NULL }; @@ -581,7 +581,7 @@ private: int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); ExampleController test(app); app.MainLoop(); return 0; diff --git a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp index 347c53f..8288713 100644 --- a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp +++ b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp @@ -31,21 +31,21 @@ using namespace DemoHelper; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-default.png" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-default.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" ); const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Rotate Object" ); const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" ); const char* APPLICATION_TITLE_ROTATE_SCENE( "Lighting: Rotate Scene" ); -const char* CHANGE_EFFECT_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); -const char* CHANGE_EFFECT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); -const char* RESET_ICON( DALI_IMAGE_DIR "icon-reset.png" ); -const char* RESET_ICON_SELECTED( DALI_IMAGE_DIR "icon-reset-selected.png" ); +const char* CHANGE_EFFECT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* CHANGE_EFFECT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); +const char* RESET_ICON( DEMO_IMAGE_DIR "icon-reset.png" ); +const char* RESET_ICON_SELECTED( DEMO_IMAGE_DIR "icon-reset-selected.png" ); -const char* SCENE_IMAGE_1( DALI_IMAGE_DIR "gallery-small-10.jpg"); -const char* SCENE_IMAGE_2( DALI_IMAGE_DIR "gallery-small-42.jpg"); -const char* SCENE_IMAGE_3( DALI_IMAGE_DIR "gallery-small-48.jpg"); +const char* SCENE_IMAGE_1( DEMO_IMAGE_DIR "gallery-small-10.jpg"); +const char* SCENE_IMAGE_2( DEMO_IMAGE_DIR "gallery-small-42.jpg"); +const char* SCENE_IMAGE_3( DEMO_IMAGE_DIR "gallery-small-48.jpg"); const float MIN_PINCH_SCALE( 0.3f ); const float MAX_PINCH_SCALE( 2.05f ); @@ -199,7 +199,7 @@ public: mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f); mContents.Add(mShadowView); - mShadowPlaneBg = ImageView::New( DALI_IMAGE_DIR "brick-wall.jpg" ); + mShadowPlaneBg = ImageView::New( DEMO_IMAGE_DIR "brick-wall.jpg" ); mShadowPlaneBg.SetParentOrigin(ParentOrigin::CENTER); mShadowPlaneBg.SetAnchorPoint(AnchorPoint::CENTER); mShadowPlaneBg.SetName("Plane"); @@ -503,7 +503,7 @@ RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp index 1cde53c..f88b5fb 100644 --- a/examples/size-negotiation/size-negotiation-example.cpp +++ b/examples/size-negotiation/size-negotiation-example.cpp @@ -33,9 +33,9 @@ struct ButtonItem namespace { -const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg"; -const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; -const char* const IMAGE = DALI_IMAGE_DIR "background-magnifier.jpg"; +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg"; +const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png"; +const char* const IMAGE = DEMO_IMAGE_DIR "background-magnifier.jpg"; const char* const TOOLBAR_TITLE = "Negotiate Size"; @@ -815,7 +815,7 @@ void RunTest( Application& application ) // Entry point for Linux & SLP applications int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/super-blur-bloom/super-blur-bloom-example.cpp b/examples/super-blur-bloom/super-blur-bloom-example.cpp index 4325541..185edf8 100644 --- a/examples/super-blur-bloom/super-blur-bloom-example.cpp +++ b/examples/super-blur-bloom/super-blur-bloom-example.cpp @@ -24,22 +24,22 @@ using namespace Dali; namespace { -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const TITLE_SUPER_BLUR( "Super Blur" ); const char * const TITLE_BLOOM( "Bloom" ); -const char * const CHANGE_BACKGROUND_ICON( DALI_IMAGE_DIR "icon-change.png" ); -const char * const CHANGE_BACKGROUND_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); -const char * const CHANGE_BLUR_ICON( DALI_IMAGE_DIR "icon-replace.png" ); -const char * const CHANGE_BLUR_ICON_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" ); +const char * const CHANGE_BACKGROUND_ICON( DEMO_IMAGE_DIR "icon-change.png" ); +const char * const CHANGE_BACKGROUND_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); +const char * const CHANGE_BLUR_ICON( DEMO_IMAGE_DIR "icon-replace.png" ); +const char * const CHANGE_BLUR_ICON_SELECTED( DEMO_IMAGE_DIR "icon-replace-selected.png" ); const char* BACKGROUND_IMAGES[]= { - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-2.jpg", - DALI_IMAGE_DIR "background-3.jpg", - DALI_IMAGE_DIR "background-4.jpg", - DALI_IMAGE_DIR "background-5.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-2.jpg", + DEMO_IMAGE_DIR "background-3.jpg", + DEMO_IMAGE_DIR "background-4.jpg", + DEMO_IMAGE_DIR "background-5.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", }; const unsigned int NUM_BACKGROUND_IMAGES( sizeof( BACKGROUND_IMAGES ) / sizeof( BACKGROUND_IMAGES[0] ) ); } @@ -314,7 +314,7 @@ RunTest(Application& app) int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); RunTest(app); diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 0f12e4d..48267a8 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -37,8 +37,8 @@ using namespace MultiLanguageStrings; namespace { - const char* const FOLDER_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_bg.png"; - const char* const FOLDER_OPEN_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_open_bg.png"; + const char* const FOLDER_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_bg.png"; + const char* const FOLDER_OPEN_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_open_bg.png"; const float BORDER_WIDTH = 4.0f; diff --git a/examples/text-fonts/text-fonts-example.cpp b/examples/text-fonts/text-fonts-example.cpp index fb1337b..f9d75f6 100644 --- a/examples/text-fonts/text-fonts-example.cpp +++ b/examples/text-fonts/text-fonts-example.cpp @@ -255,7 +255,7 @@ void RunTest( Application& application ) /** Entry point for Linux & Tizen applications */ int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp index 7ec8f1e..699faa2 100644 --- a/examples/text-label-emojis/text-label-emojis.cpp +++ b/examples/text-label-emojis/text-label-emojis.cpp @@ -142,7 +142,7 @@ void RunTest( Application& application ) // int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp index 61af222..2dce3a3 100644 --- a/examples/text-label-multi-language/text-label-multi-language-example.cpp +++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp @@ -144,7 +144,7 @@ void RunTest( Application& application ) /** Entry point for Linux & Tizen applications */ int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index 0636177..dc96c5e 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -34,7 +34,7 @@ using namespace MultiLanguageStrings; namespace { - const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "grab-handle.png"; + const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "grab-handle.png"; const unsigned int KEY_ZERO = 10; const unsigned int KEY_ONE = 11; @@ -297,7 +297,7 @@ void RunTest( Application& application ) /** Entry point for Linux & Tizen applications */ int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/text-message-field/text-message-field-example.cpp b/examples/text-message-field/text-message-field-example.cpp index 4e337b5..4a8e3b0 100644 --- a/examples/text-message-field/text-message-field-example.cpp +++ b/examples/text-message-field/text-message-field-example.cpp @@ -28,7 +28,7 @@ using namespace Dali::Toolkit; namespace { - const char* DESKTOP_IMAGE( DALI_IMAGE_DIR "woodEffect.jpg" ); + const char* DESKTOP_IMAGE( DEMO_IMAGE_DIR "woodEffect.jpg" ); const Vector2 DESKTOP_SIZE( Vector2( 1440, 1600 ) ); const Vector2 PHOTOBOX_SIZE( Vector2(330.0f, 80.0f ) ); const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f; @@ -163,7 +163,7 @@ void RunTest( Application& application ) /** Entry point for Linux & Tizen applications */ int main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application ); diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index ebeb179..b7b79b6 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -26,8 +26,8 @@ using namespace Dali; namespace { -const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" ); -const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" ); +const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" ); +const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" ); #define MAKE_SHADER(A)#A diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 2747c25..fd7dad2 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.1.17 +Version: 1.1.18 Release: 1 Group: System/Libraries License: Apache-2.0 @@ -11,17 +11,18 @@ Source0: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: dali -Requires: dali-adaptor -Requires: dali-toolkit + BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-media-player) -BuildRequires: dali-toolkit-devel -BuildRequires: dali-adaptor-devel BuildRequires: pkgconfig(dlog) BuildRequires: gettext-tools +BuildRequires: pkgconfig(dali-core) +BuildRequires: pkgconfig(dali-toolkit) + +# DALi C++ applications always run on dali-adaptor. +BuildRequires: pkgconfig(dali-adaptor) %description The OpenGLES Canvas Core Demo is a collection of examples and demonstrations diff --git a/resources/images/00_popup_bg.9.png b/resources/images/00_popup_bg.9.png new file mode 100644 index 0000000..3b4e792 --- /dev/null +++ b/resources/images/00_popup_bg.9.png diff --git a/resources/scripts/animated-buttons.json b/resources/scripts/animated-buttons.json index f7e2a8e..acc9c94 100644 --- a/resources/scripts/animated-buttons.json +++ b/resources/scripts/animated-buttons.json @@ -4,25 +4,13 @@ "type": "ImageActor", "name": "On", "relayoutEnabled": false, - "position": [ - 374, - 215, - 0 - ], - "size": [ - 144, - 144, - 1 - ], + "position": [ 374, 215, 0 ], + "size": [ 144, 144, 1 ], "sizeAspectRatio": false, - "color": [ - 1, - 1, - 1, - 1 + "color": [ 1, 1, 1, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}spot_button_on.png", + "filename": "{DEMO_IMAGE_DIR}spot_button_on.png", "width": 144, "height": 144, "loadPolicy": "IMMEDIATE", @@ -35,25 +23,12 @@ "type": "ImageActor", "name": "Off", "relayoutEnabled": false, - "position": [ - 129, - 215, - 0 - ], - "size": [ - 144, - 144, - 1 - ], + "position": [ 129, 215, 0 ], + "size": [ 144, 144, 1 ], "sizeAspectRatio": false, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}spot_button_off.png", + "filename": "{DEMO_IMAGE_DIR}spot_button_off.png", "width": 144, "height": 144, "loadPolicy": "IMMEDIATE", @@ -66,26 +41,13 @@ "type": "ImageActor", "name": "Right", "relayoutEnabled": false, - "position": [ - 418.5, - 214.5, - 0 - ], - "size": [ - 85, - 161, - 1 - ], + "position": [ 418.5, 214.5, 0 ], + "size": [ 85, 161, 1 ], "sizeAspectRatio": false, "visible": true, - "color": [ - 0, - 0, - 0, - 1 - ], + "color": [ 0, 0, 0, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}curve-right.png", + "filename": "{DEMO_IMAGE_DIR}curve-right.png", "width": 85, "height": 161, "loadPolicy": "IMMEDIATE", @@ -98,26 +60,13 @@ "type": "ImageActor", "name": "Left", "relayoutEnabled": false, - "position": [ - 331, - 214.5, - 0 - ], - "size": [ - 88, - 161, - 1 - ], + "position": [ 331, 214.5, 0 ], + "size": [ 88, 161, 1 ], "sizeAspectRatio": false, "visible": true, - "color": [ - 0, - 0, - 0, - 1 - ], + "color": [ 0, 0, 0, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}curve-left.png", + "filename": "{DEMO_IMAGE_DIR}curve-left.png", "width": 87, "height": 161, "loadPolicy": "IMMEDIATE", @@ -130,30 +79,13 @@ "type": "ImageActor", "name": "Middle", "relayoutEnabled": false, - "position": [ - 375.5, - 214.5, - 0 - ], - "anchorPoint": [ - 0, - 0.5, - 0.5 - ], - "size": [ - 1, - 161, - 1 - ], + "position": [ 375.5, 214.5, 0 ], + "anchorPoint": [ 0, 0.5, 0.5 ], + "size": [ 1, 161, 1 ], "sizeAspectRatio": false, - "color": [ - 0, - 0, - 0, - 1 - ], + "color": [ 0, 0, 0, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}curve-middle.png", + "filename": "{DEMO_IMAGE_DIR}curve-middle.png", "width": 13, "height": 161, "loadPolicy": "IMMEDIATE", @@ -166,25 +98,12 @@ "type": "ImageActor", "name": "Jelly", "relayoutEnabled": false, - "position": [ - 374, - 215, - 0 - ], - "size": [ - 144, - 144, - 1 - ], + "position": [ 374, 215, 0 ], + "size": [ 144, 144, 1 ], "sizeAspectRatio": false, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}spot_jelly_on.png", + "filename": "{DEMO_IMAGE_DIR}spot_jelly_on.png", "width": 144, "height": 144, "loadPolicy": "IMMEDIATE", @@ -197,73 +116,34 @@ "type": "Control", "name": "Left Crop", "relayoutEnabled": false, - "position": [ - 144.5, - 218.5, - 0.5 - ], - "size": [ - 275, - 243, - 1 - ], + "position": [ 144.5, 218.5, 0.5 ], + "size": [ 275, 243, 1 ], "sizeAspectRatio": false, "background": {"color": [ 1, 1, 1, 1 ]}, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "actors": [] }, { "type": "Control", "name": "Right Crop", "relayoutEnabled": false, - "position": [ - 629.5, - 218.5, - 0.5 - ], - "size": [ - 335, - 243, - 1 - ], + "position": [ 629.5, 218.5, 0.5 ], + "size": [ 335, 243, 1 ], "sizeAspectRatio": false, "background": {"color": [ 1, 1, 1, 1 ]}, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "actors": [] }, { "type": "ImageActor", "name": "JellyOff", "relayoutEnabled": false, - "position": [ - 121, - -117, - 0 - ], - "size": [ - 144, - 144, - 1 - ], + "position": [ 121, -117, 0 ], + "size": [ 144, 144, 1 ], "sizeAspectRatio": false, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}spot_jelly_off.png", + "filename": "{DEMO_IMAGE_DIR}spot_jelly_off.png", "width": 144, "height": 144, "loadPolicy": "IMMEDIATE", @@ -281,23 +161,10 @@ 217.33333333333331, 0 ], - "size": [ - 196, - 184, - 1 - ], + "size": [ 196, 184, 1 ], "sizeAspectRatio": false, - "scale": [ - 1, - 1, - 1 - ], - "color": [ - 1, - 1, - 1, - 1 - ], + "scale": [ 1, 1, 1 ], + "color": [ 1, 1, 1, 1 ], "actors": [], "signals": [ { @@ -311,23 +178,10 @@ "type": "Control", "name": "Control Off", "relayoutEnabled": false, - "position": [ - 123.5, - -117, - 0 - ], - "size": [ - 193, - 182, - 1 - ], + "position": [ 123.5, -117, 0 ], + "size": [ 193, 182, 1 ], "sizeAspectRatio": false, - "color": [ - 1, - 1, - 1, - 1 - ], + "color": [ 1, 1, 1, 1 ], "actors": [], "signals": [ { @@ -344,11 +198,7 @@ { "actor": "Left", "property": "position", - "value": [ - 331, - 214.5, - 0 - ], + "value": [ 331, 214.5, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.106, @@ -359,11 +209,7 @@ { "actor": "Middle", "property": "position", - "value": [ - 375.5, - 214.5, - 0 - ], + "value": [ 375.5, 214.5, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.106, @@ -374,11 +220,7 @@ { "actor": "Middle", "property": "size", - "value": [ - 250, - 161, - 1 - ], + "value": [ 250, 161, 1 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -389,11 +231,7 @@ { "actor": "Middle", "property": "size", - "value": [ - 1, - 161, - 1 - ], + "value": [ 1, 161, 1 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.127, @@ -404,11 +242,7 @@ { "actor": "JellyOff", "property": "position", - "value": [ - 374, - 215, - 0 - ], + "value": [ 374, 215, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 1.486, @@ -419,11 +253,7 @@ { "actor": "Left Crop", "property": "position", - "value": [ - 144.5, - 218.5, - 0.5 - ], + "value": [ 144.5, 218.5, 0.5 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.106, @@ -434,11 +264,7 @@ { "actor": "Right", "property": "position", - "value": [ - 418.5, - 214.5, - 0 - ], + "value": [ 418.5, 214.5, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -449,11 +275,7 @@ { "actor": "Right Crop", "property": "position", - "value": [ - 629.5, - 218.5, - 0.5 - ], + "value": [ 629.5, 218.5, 0.5 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -479,11 +301,7 @@ { "actor": "Jelly", "property": "position", - "value": [ - 121, - -117, - 0 - ], + "value": [ 121, -117, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -494,11 +312,7 @@ { "actor": "Jelly", "property": "position", - "value": [ - 374, - 215, - 0 - ], + "value": [ 374, 215, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 2.765, @@ -509,11 +323,7 @@ { "actor": "JellyOff", "property": "position", - "value": [ - 121, - -117, - 0 - ], + "value": [ 121, -117, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 2.765, @@ -524,11 +334,7 @@ { "actor": "Control Off", "property": "position", - "value": [ - 123.5, - -117, - 0 - ], + "value": [ 123.5, -117, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -544,11 +350,7 @@ { "actor": "Left", "property": "position", - "value": [ - 86, - 214.5, - 0 - ], + "value": [ 86, 214.5, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -559,11 +361,7 @@ { "actor": "Middle", "property": "position", - "value": [ - 130, - 214.5, - 0 - ], + "value": [ 130, 214.5, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -574,11 +372,7 @@ { "actor": "Middle", "property": "size", - "value": [ - 250, - 161, - 1 - ], + "value": [ 250, 161, 1 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -589,11 +383,7 @@ { "actor": "Middle", "property": "size", - "value": [ - 1, - 161, - 1 - ], + "value": [ 1, 161, 1 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.127, @@ -604,11 +394,7 @@ { "actor": "Jelly", "property": "position", - "value": [ - 130, - 215, - 0 - ], + "value": [ 130, 215, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 1.486, @@ -619,11 +405,7 @@ { "actor": "Left Crop", "property": "position", - "value": [ - -95, - 219, - 0 - ], + "value": [ -95, 219, 0 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 0, @@ -634,11 +416,7 @@ { "actor": "Right", "property": "position", - "value": [ - 172, - 214.5, - 0.5 - ], + "value": [ 172, 214.5, 0.5 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.106, @@ -649,11 +427,7 @@ { "actor": "Right Crop", "property": "position", - "value": [ - 383, - 218.5, - 0.5 - ], + "value": [ 383, 218.5, 0.5 ], "alphaFunction": "EASE_OUT", "timePeriod": { "delay": 3.106, @@ -664,11 +438,7 @@ { "actor": "Control On", "property": "position", - "value": [ - 371.26, - -131, - 0 - ], + "value": [ 371.26, -131, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -679,11 +449,7 @@ { "actor": "JellyOff", "property": "position", - "value": [ - 130, - 215, - 0 - ], + "value": [ 130, 215, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 2.765, @@ -694,11 +460,7 @@ { "actor": "Jelly", "property": "position", - "value": [ - 121, - -117, - 0 - ], + "value": [ 121, -117, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 2.765, @@ -709,11 +471,7 @@ { "actor": "Control Off", "property": "position", - "value": [ - 123.5, - 215, - 0 - ], + "value": [ 123.5, 215, 0 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 2.765, diff --git a/resources/scripts/animation.json b/resources/scripts/animation.json index 624d285..0b304bc 100644 --- a/resources/scripts/animation.json +++ b/resources/scripts/animation.json @@ -120,7 +120,7 @@ "name": "image", "type": "ImageActor", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-large-21.jpg" }, "relayoutEnabled": false, "position": [0, 200, 0], diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json index f8ad659..1860174 100644 --- a/resources/scripts/background-color.json +++ b/resources/scripts/background-color.json @@ -51,7 +51,7 @@ "anchorPoint": "TOP_CENTER", "size": [400, 150, 1], "background": { - "filename": "{DALI_IMAGE_DIR}button-background.png" + "filename": "{DEMO_IMAGE_DIR}button-background.png" } }, @@ -63,7 +63,7 @@ "anchorPoint": "BOTTOM_CENTER", "size": [400, 150, 1], "background": { - "filename": "{DALI_IMAGE_DIR}button-background.png" + "filename": "{DEMO_IMAGE_DIR}button-background.png" } } ] diff --git a/resources/scripts/button.json b/resources/scripts/button.json index 1541aff..0d5d2b2 100644 --- a/resources/scripts/button.json +++ b/resources/scripts/button.json @@ -26,8 +26,8 @@ "anchorPoint": "TOP_CENTER", "position": [0, 0, 0], "size": [400, 200, 0], - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png", + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-2.png", "labelText": "Normal" }, @@ -39,9 +39,9 @@ "position": [0, 0, 0], "size": [400, 200, 0], "disabled": true, - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png", - "disabledStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-2.png", + "disabledStateImage": "{DEMO_IMAGE_DIR}blocks-brick-3.png", "labelText": "Disabled" }, @@ -54,8 +54,8 @@ "position": [0, 0, 0], "size": [400, 200, 0], "togglable": true, - "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", + "unselectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DEMO_IMAGE_DIR}blocks-brick-3.png", "labelText": "Toggle", "signals": [{ "name": "selected", diff --git a/resources/scripts/choreography.json b/resources/scripts/choreography.json index b57baa4..717b343 100644 --- a/resources/scripts/choreography.json +++ b/resources/scripts/choreography.json @@ -5,29 +5,16 @@ { "type": "ImageActor", "inheritPosition": true, - "size": [ - 70, - 70, - 1 - ], - "color": [ - 0.85, - 0.75, - 0.45, - 1 - ], + "size": [ 70, 70, 1 ], + "color": [ 0.85, 0.75, 0.45, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}circle.png" + "filename": "{DEMO_IMAGE_DIR}circle.png" } }, "rectangleControl": { "type": "Control", - "size": [ - 60, - 60, - 1 - ], + "size": [ 60, 60, 1 ], "background": {"color": [0.95, 0.41, 0.18, 1] }, "colorAlpha": 0 } @@ -37,17 +24,9 @@ "type": "Control", "actors": [], "name": "topContainer", - "position": [ - 180, - 105, - 0 - ], + "position": [ 180, 105, 0 ], "inheritPosition": true, - "size": [ - 20, - 20, - 1 - ], + "size": [ 20, 20, 1 ], "sizeAspectRatio": false, "background": { "color": [0.85, 0.75, 0.45, 1] }, "colorAlpha": 0 @@ -55,11 +34,7 @@ { "type": "circleControl", "name": "Circle1", - "position": [ - 84, - 198, - -1 - ], + "position": [ 84, 198, -1 ], "signals": [ { "name": "touched", @@ -71,65 +46,37 @@ { "type": "circleControl", "name": "Circle2", - "position": [ - 151, - 198, - -1 - ] + "position": [ 151, 198, -1 ] }, { "type": "circleControl", "name": "Circle3", - "position": [ - 285, - 198, - -1 - ] + "position": [ 285, 198, -1 ] }, { "type": "circleControl", "name": "Circle4", - "position": [ - 218, - 198, - -1 - ] + "position": [ 218, 198, -1 ] }, { "type": "rectangleControl", "name": "Rect1", - "position": [ - 50, - 292, - 0 - ] + "position": [ 50, 292, 0 ] }, { "type": "rectangleControl", "name": "Rect2", - "position": [ - 120, - 292, - 0 - ] + "position": [ 120, 292, 0 ] }, { "type": "rectangleControl", "name": "Rect3", - "position": [ - 190, - 292, - 0 - ] + "position": [ 190, 292, 0 ] }, { "type": "rectangleControl", "name": "Rect4", - "position": [ - 260, - 292, - 0 - ] + "position": [ 260, 292, 0 ] } ], "animations": { @@ -138,11 +85,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 84, - 198, - -1 - ], + "value": [ 84, 198, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -153,11 +96,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 130, - 190, - -1 - ], + "value": [ 130, 190, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -168,11 +107,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 150, - 170, - -1 - ], + "value": [ 150, 170, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0.05, @@ -183,11 +118,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 160, - 150, - -1 - ], + "value": [ 160, 150, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0.1, @@ -198,11 +129,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 170, - 125, - -1 - ], + "value": [ 170, 125, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0.151, @@ -213,11 +140,7 @@ { "actor": "Circle1", "property": "position", - "value": [ - 180, - 100, - -1 - ], + "value": [ 180, 100, -1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0.2, @@ -228,11 +151,7 @@ { "actor": "Circle1", "property": "size", - "value": [ - 70, - 70, - 1 - ], + "value": [ 70, 70, 1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -243,11 +162,7 @@ { "actor": "Circle1", "property": "size", - "value": [ - 20, - 20, - 1 - ], + "value": [ 20, 20, 1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0.151, @@ -258,11 +173,7 @@ { "actor": "Circle2", "property": "scale", - "value": [ - 1, - 1, - 1 - ], + "value": [ 1, 1, 1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, @@ -273,11 +184,7 @@ { "actor": "Circle2", "property": "scale", - "value": [ - 0.1, - 0.1, - 1 - ], + "value": [ 0.1, 0.1, 1 ], "alphaFunction": "LINEAR", "timePeriod": { "delay": 0, diff --git a/resources/scripts/contacts.json b/resources/scripts/contacts.json index 723008b..f84a016 100644 --- a/resources/scripts/contacts.json +++ b/resources/scripts/contacts.json @@ -25,7 +25,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-main.png", + "filename": "{DEMO_IMAGE_DIR}contacts-main.png", "width": 361, "height": 640, "loadPolicy": "IMMEDIATE", @@ -56,7 +56,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-background.png", + "filename": "{DEMO_IMAGE_DIR}contacts-background.png", "width": 360, "height": 282, "loadPolicy": "IMMEDIATE", @@ -104,7 +104,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-image.png", + "filename": "{DEMO_IMAGE_DIR}contacts-image.png", "width": 53, "height": 52, "loadPolicy": "IMMEDIATE", @@ -135,7 +135,7 @@ 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}contacts-text.png" + "filename": "{DEMO_IMAGE_DIR}contacts-text.png" } }, { @@ -155,7 +155,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-add.png", + "filename": "{DEMO_IMAGE_DIR}contacts-add.png", "width": 80, "height": 71, "loadPolicy": "IMMEDIATE", @@ -179,7 +179,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-messenger.png", + "filename": "{DEMO_IMAGE_DIR}contacts-messenger.png", "width": 360, "height": 77, "loadPolicy": "IMMEDIATE", @@ -203,7 +203,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-email.png", + "filename": "{DEMO_IMAGE_DIR}contacts-email.png", "width": 360, "height": 79, "loadPolicy": "IMMEDIATE", @@ -227,7 +227,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-mobile.png", + "filename": "{DEMO_IMAGE_DIR}contacts-mobile.png", "width": 360, "height": 80, "loadPolicy": "IMMEDIATE", @@ -251,7 +251,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-home.png", + "filename": "{DEMO_IMAGE_DIR}contacts-home.png", "width": 360, "height": 75, "loadPolicy": "IMMEDIATE", @@ -275,7 +275,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-circle.png", + "filename": "{DEMO_IMAGE_DIR}contacts-circle.png", "width": 100, "height": 100, "loadPolicy": "IMMEDIATE", @@ -299,7 +299,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}contacts-plain.png", + "filename": "{DEMO_IMAGE_DIR}contacts-plain.png", "width": 360, "height": 77, "loadPolicy": "IMMEDIATE", diff --git a/resources/scripts/gallery.json b/resources/scripts/gallery.json index 43fe3d0..cb7cdfd 100644 --- a/resources/scripts/gallery.json +++ b/resources/scripts/gallery.json @@ -53,7 +53,7 @@ "position": [ 0, 0, -1 ], "size": [ 450, 795, 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}animation-list.png" + "filename": "{DEMO_IMAGE_DIR}animation-list.png" } }, { @@ -120,35 +120,35 @@ "type": "imageType", "name": "picture1", "image": { - "filename": "{DALI_IMAGE_DIR}animation-picture-1.png" + "filename": "{DEMO_IMAGE_DIR}animation-picture-1.png" } }, { "type": "imageType", "name": "picture2", "image": { - "filename": "{DALI_IMAGE_DIR}animation-picture-2.png" + "filename": "{DEMO_IMAGE_DIR}animation-picture-2.png" } }, { "type": "imageType", "name": "picture3", "image": { - "filename": "{DALI_IMAGE_DIR}animation-picture-3.png" + "filename": "{DEMO_IMAGE_DIR}animation-picture-3.png" } }, { "type": "imageType", "name": "picture4", "image": { - "filename": "{DALI_IMAGE_DIR}animation-picture-4.png" + "filename": "{DEMO_IMAGE_DIR}animation-picture-4.png" } }, { "type": "imageType", "name": "picture5", "image": { - "filename": "{DALI_IMAGE_DIR}animation-picture-5.png" + "filename": "{DEMO_IMAGE_DIR}animation-picture-5.png" } } ], diff --git a/resources/scripts/music-library.json b/resources/scripts/music-library.json index dc197a0..d3210aa 100644 --- a/resources/scripts/music-library.json +++ b/resources/scripts/music-library.json @@ -25,7 +25,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-main-screen.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-main-screen.png", "width": 545, "height": 860, "loadPolicy": "IMMEDIATE", @@ -52,7 +52,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-circle.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-circle.png", "width": 128, "height": 128, "loadPolicy": "IMMEDIATE", @@ -76,7 +76,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-triangle.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-triangle.png", "width": 185, "height": 198, "loadPolicy": "IMMEDIATE", @@ -100,7 +100,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-rectangle.png", "width": 128, "height": 128, "loadPolicy": "IMMEDIATE", @@ -195,7 +195,7 @@ "color":[0,0,0,0], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-foxtrot-oscar.png", "width": 545, "height": 95, "loadPolicy": "IMMEDIATE", @@ -251,7 +251,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-the-solars.png", "width": 545, "height": 218, "loadPolicy": "IMMEDIATE", @@ -317,7 +317,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-record-cover.png", "width": 545, "height": 502, "loadPolicy": "IMMEDIATE", @@ -341,7 +341,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-arrow.png", "width": 128, "height": 128, "loadPolicy": "IMMEDIATE", @@ -365,7 +365,7 @@ ], "sizeAspectRatio": false, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-star.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-star.png", "width": 121, "height": 128, "loadPolicy": "IMMEDIATE", @@ -394,7 +394,7 @@ 1 ], "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-pause.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-pause.png", "width": 128, "height": 128, "loadPolicy": "IMMEDIATE", @@ -418,7 +418,7 @@ ], "sizeAspectRatio": true, "image": { - "filename": "{DALI_IMAGE_DIR}music-libray-menu.png", + "filename": "{DEMO_IMAGE_DIR}music-libray-menu.png", "width": 32, "height": 32, "loadPolicy": "IMMEDIATE", diff --git a/resources/scripts/shader-effect-ripple.json b/resources/scripts/shader-effect-ripple.json index e32fc1e..012f674 100644 --- a/resources/scripts/shader-effect-ripple.json +++ b/resources/scripts/shader-effect-ripple.json @@ -13,7 +13,7 @@ "heightResizePolicy":"DIMENSION_DEPENDENCY", "effect": "Ripple2D", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg", + "filename": "{DEMO_IMAGE_DIR}gallery-medium-25.jpg", "width": 400, "height": 400, "loadPolicy": "IMMEDIATE", diff --git a/resources/scripts/slider.json b/resources/scripts/slider.json index 723e9de..28ef9d5 100644 --- a/resources/scripts/slider.json +++ b/resources/scripts/slider.json @@ -91,9 +91,9 @@ "hitRegion": [0, 48], "backingRegion": [0, 30], "handleRegion": [48, 48], - "backingImageName": "{DALI_IMAGE_DIR}button-up-14.9.png", - "handleImageName": "{DALI_IMAGE_DIR}blocks-ball.png", - "progressImageName": "{DALI_IMAGE_DIR}button-down.9.png" + "backingImageName": "{DEMO_IMAGE_DIR}button-up-14.9.png", + "handleImageName": "{DEMO_IMAGE_DIR}blocks-ball.png", + "progressImageName": "{DEMO_IMAGE_DIR}button-down.9.png" }, { "type": "Slider", "parentOrigin": "TOP_CENTER", diff --git a/resources/scripts/super-blur-view.json b/resources/scripts/super-blur-view.json index bcdb61b..0d8bd11 100644 --- a/resources/scripts/super-blur-view.json +++ b/resources/scripts/super-blur-view.json @@ -54,7 +54,7 @@ "position": [0, 10, 0], "size": [460, 600, 0], "image": { - "filename": "{DALI_IMAGE_DIR}background-4.jpg" + "filename": "{DEMO_IMAGE_DIR}background-4.jpg" } }, @@ -70,8 +70,8 @@ "type": "TextLabel", "text": "Blur" }, - "unselectedStateImage": "{DALI_IMAGE_DIR}button-background.png", - "selectedStateImage": "{DALI_IMAGE_DIR}button-background.png", + "unselectedStateImage": "{DEMO_IMAGE_DIR}button-background.png", + "selectedStateImage": "{DEMO_IMAGE_DIR}button-background.png", "signals": [{ "name": "pressed", "action": "play", diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json index 81392c1..8463bb7 100644 --- a/resources/scripts/table-view.json +++ b/resources/scripts/table-view.json @@ -65,7 +65,7 @@ "type":"ImageActor", "heightResizePolicy":"FILL_TO_PARENT", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-small-1.jpg" }, "customProperties": { // properties registered dynamically "cellIndex": [0,0], // property to specify the top-left cell this child occupies @@ -77,7 +77,7 @@ "type":"ImageActor", "heightResizePolicy":"FILL_TO_PARENT", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-small-2.jpg" }, "customProperties": { // properties registered dynamically "cellIndex": [0,1], @@ -87,7 +87,7 @@ "name":"gallery3", "type":"ImageActor", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-small-3.jpg" }, "customProperties": { "cellIndex":[1,1], @@ -100,7 +100,7 @@ "type":"ImageActor", "widthResizePolicy":"FILL_TO_PARENT", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-small-4.jpg" }, "customProperties": { "cellIndex":[2,2] @@ -111,7 +111,7 @@ "widthResizePolicy":"FILL_TO_PARENT", "heightResizePolicy":"FILL_TO_PARENT", "image": { - "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg" + "filename": "{DEMO_IMAGE_DIR}gallery-small-5.jpg" }, "customProperties": { "cellIndex":[3,2], diff --git a/resources/style/demo-theme.json b/resources/style/demo-theme.json.in index b7d30ab..4eb3e59 100644 --- a/resources/style/demo-theme.json +++ b/resources/style/demo-theme.json.in @@ -1,27 +1,31 @@ /* -Copyright (c) 2000-2015 Samsung Electronics Co., Ltd All Rights Reserved - -This file is part of Dali Toolkit - -PROPRIETARY/CONFIDENTIAL - -This software is the confidential and proprietary information of -SAMSUNG ELECTRONICS ("Confidential Information"). You shall not -disclose such Confidential Information and shall use it only in -accordance with the terms of the license agreement you entered -into with SAMSUNG ELECTRONICS. - -SAMSUNG make no representations or warranties about the suitability -of the software, either express or implied, including but not limited -to the implied warranties of merchantability, fitness for a particular -purpose, or non-infringement. SAMSUNG shall not be liable for any -damages suffered by licensee as a result of using, modifying or -distributing this software or its derivatives. -*/ + * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ { + "constants": + { + "DEMO_IMAGE_DIR":"@DEMO_STYLE_IMAGE_DIR@" + }, + "styles": { + "confirmationpopup":{ + "popupBackgroundImage":"{DEMO_IMAGE_DIR}00_popup_bg.9.png" + }, + "textlabel-Rosemary": { "fontFamily":"Rosemary" diff --git a/resources/style/mobile/demo-theme.json b/resources/style/mobile/demo-theme.json.in index ce18131..c3f75af 100644 --- a/resources/style/mobile/demo-theme.json +++ b/resources/style/mobile/demo-theme.json.in @@ -1,30 +1,26 @@ /* -Copyright (c) 2000-2015 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd -This file is part of Dali Toolkit - -PROPRIETARY/CONFIDENTIAL - -This software is the confidential and proprietary information of -SAMSUNG ELECTRONICS ("Confidential Information"). You shall not -disclose such Confidential Information and shall use it only in -accordance with the terms of the license agreement you entered -into with SAMSUNG ELECTRONICS. - -SAMSUNG make no representations or warranties about the suitability -of the software, either express or implied, including but not limited -to the implied warranties of merchantability, fitness for a particular -purpose, or non-infringement. SAMSUNG shall not be liable for any -damages suffered by licensee as a result of using, modifying or -distributing this software or its derivatives. -*/ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ { "styles": { "textlabel-Rosemary": { - "fontFamily":"Rosemary" + "fontFamily":"Rosemary" }, "textlabel": { diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h index 0f0dea9..633e07a 100644 --- a/shared/dali-demo-strings.h +++ b/shared/dali-demo-strings.h @@ -98,6 +98,8 @@ extern "C" #define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line" #define DALI_DEMO_STR_TITLE_COLOR_GRADIENT "Color Gradient" #define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View" +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA "Image View Pixel Area" +#define DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING "Image View Alpha Blending" #define DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM "Super Blur and Bloom" #endif