diff options
| author | David Steele <david.steele@samsung.com> | 2016-01-14 16:12:33 +0000 |
|---|---|---|
| committer | David Steele <david.steele@samsung.com> | 2016-01-21 14:01:51 +0000 |
| commit | 46e6a0e92784c860b2b5425e34941c6574dd8062 (patch) | |
| tree | 9c98ba0a42e077c44d94fa070c2f18ea949d6a0e /demo | |
| parent | 6a71763a6a51df794eb134620a9965b559ae4f6a (diff) | |
| download | dali-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 'demo')
| -rw-r--r-- | demo/dali-demo.cpp | 6 | ||||
| -rw-r--r-- | demo/dali-table-view.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp index 70e60854..f50152c9 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); diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index e1ff174a..51689a2d 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) { |