Peter M. Groen / dali-demo

Commit 138971068e4bf9328faea8a8db45e314202aa4c2

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents c318ffe3 5286bad9

Merge "Remove Particle System from dali-examples, add to XML file" into devel/master

Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
com.samsung.dali-demo.xml
  View file @1389710
... ... @@ -211,6 +211,9 @@
211 211 <ui-application appid="page-turn-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/page-turn-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
212 212 <label>Page Turn</label>
213 213 </ui-application>
  214 + <ui-application appid="particle-system.example" exec="/usr/apps/com.samsung.dali-demo/bin/particle-system.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
  215 + <label>Particle System</label>
  216 + </ui-application>
214 217 <ui-application appid="particles.example" exec="/usr/apps/com.samsung.dali-demo/bin/particles.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
215 218 <label>Particles</label>
216 219 </ui-application>
... ...
examples-reel/dali-examples-reel.cpp
  View file @1389710
... ... @@ -78,7 +78,6 @@ int DALI_EXPORT_API main(int argc, char** argv)
78 78 demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
79 79 demo.AddExample(Example("motion-stretch.example", DALI_DEMO_STR_TITLE_MOTION_STRETCH));
80 80 demo.AddExample(Example("native-image-source.example", DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE));
81   - demo.AddExample(Example("particle-system.example", DALI_DEMO_STR_TITLE_PARTICLE_SYSTEM));
82 81 demo.AddExample(Example("popup.example", DALI_DEMO_STR_TITLE_POPUP));
83 82 demo.AddExample(Example("pivot.example", DALI_DEMO_STR_TITLE_PIVOT));
84 83 demo.AddExample(Example("primitive-shapes.example", DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES));
... ...