summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Steele <david.steele@samsung.com>2016-01-14 16:12:33 +0000
committerDavid Steele <david.steele@samsung.com>2016-01-21 14:01:51 +0000
commit46e6a0e92784c860b2b5425e34941c6574dd8062 (patch)
tree9c98ba0a42e077c44d94fa070c2f18ea949d6a0e /.gitignore
parent6a71763a6a51df794eb134620a9965b559ae4f6a (diff)
downloaddali-demo-46e6a0e92784c860b2b5425e34941c6574dd8062.tar.gz
dali-demo-46e6a0e92784c860b2b5425e34941c6574dd8062.tar.bz2
dali-demo-46e6a0e92784c860b2b5425e34941c6574dd8062.zip
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>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6e2e2b09..9a6f694f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ dali-builder
/build/desktop
/packaging/home*
*.mo
+demo-theme.json