Changed DALI_*_DIR to DEMO_*_DIR 46/57046/7
authorDavid Steele <david.steele@samsung.com>
Thu, 14 Jan 2016 16:12:33 +0000 (16:12 +0000)
committerDavid Steele <david.steele@samsung.com>
Thu, 21 Jan 2016 14:01:51 +0000 (14:01 +0000)
commit46e6a0e92784c860b2b5425e34941c6574dd8062
tree9c98ba0a42e077c44d94fa070c2f18ea949d6a0e
parent6a71763a6a51df794eb134620a9965b559ae4f6a
Changed DALI_*_DIR to DEMO_*_DIR

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

It must not be overridden by applications.

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

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

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

Change-Id: Ie43a6611a8db3fc0afc6a1cd4d9d6e48afef75e7
Signed-off-by: David Steele <david.steele@samsung.com>
66 files changed:
.gitignore
build/tizen/CMakeLists.txt
builder/dali-builder.cpp
demo/dali-demo.cpp
demo/dali-table-view.cpp
examples/atlas/atlas-example.cpp
examples/benchmark/benchmark.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/gradients/gradients-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
examples/image-view-pixel-area/image-view-pixel-area-example.cpp
examples/image-view/image-view-example.cpp
examples/item-view/item-view-example.cpp
examples/line-mesh/line-mesh-example.cpp
examples/logging/logging-example.cpp
examples/magnifier/magnifier-example.cpp
examples/mesh-sorting/mesh-sorting-example.cpp
examples/metaball-explosion/metaball-explosion-example.cpp
examples/metaball-refrac/metaball-refrac-example.cpp
examples/model3d-view/model3d-view-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
examples/point-mesh/point-mesh-example.cpp
examples/popup/popup-example.cpp
examples/radial-menu/radial-menu-example.cpp
examples/refraction-effect/refraction-effect-example.cpp
examples/scripting/launcher.cpp
examples/scripting/scripting-example.cpp
examples/scroll-view/scroll-view-example.cpp
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
examples/super-blur-bloom/super-blur-bloom-example.cpp
examples/text-field/text-field-example.cpp
examples/text-fonts/text-fonts-example.cpp
examples/text-label-emojis/text-label-emojis.cpp
examples/text-label-multi-language/text-label-multi-language-example.cpp
examples/text-label/text-label-example.cpp
examples/text-message-field/text-message-field-example.cpp
examples/textured-mesh/textured-mesh-example.cpp
resources/images/00_popup_bg.9.png [new file with mode: 0644]
resources/scripts/animated-buttons.json
resources/scripts/animation.json
resources/scripts/background-color.json
resources/scripts/button.json
resources/scripts/choreography.json
resources/scripts/contacts.json
resources/scripts/gallery.json
resources/scripts/music-library.json
resources/scripts/shader-effect-ripple.json
resources/scripts/slider.json
resources/scripts/super-blur-view.json
resources/scripts/table-view.json
resources/style/demo-theme.json [deleted file]
resources/style/demo-theme.json.in [new file with mode: 0644]
resources/style/mobile/demo-theme.json [deleted file]
resources/style/mobile/demo-theme.json.in [new file with mode: 0644]