Peter M. Groen / dali-demo

Commit f80c790e9a0b20a9b74384fdc2f58fae2c9f5a04

Authored by Adeel Kazmi
1 parent 037f5765

Added layouting example to dali-examples 

Change-Id: I2858ce28fcd0c025cf497046453eaca7d4321625
Inline Side-by-side
Showing 7 changed files with 22 additions and 4 deletions
com.samsung.dali-demo.xml
  View file @f80c790
... ... @@ -248,8 +248,13 @@
248 248 <label>Card Active App</label>
249 249 </ui-application>
250 250 <ui-application appid="image-policies.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-policies.example" nodisplay="true" multiple="false" taskmanage="true" type="c++app">
251   - <label>Image Policies</label></ui-application>
252   - <privileges>
  251 + <label>Image Policies</label>
  252 + </ui-application>
  253 + <ui-application appid="layouting.example" exec="/usr/apps/com.samsung.dali-demo/bin/layouting.example" nodisplay="true" multiple="false" taskmanage="true" type="c++app">
  254 + <label>Layouting</label>
  255 + </ui-application>
  256 +
  257 + <privileges>
253 258 <privilege>http://tizen.org/privilege/mediastorage</privilege>
254 259 <privilege>http://tizen.org/privilege/externalstorage</privilege>
255 260 <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
... ...
examples-reel/dali-examples-reel.cpp
  View file @f80c790
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2018 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -56,6 +56,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
56 56 demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA));
57 57 demo.AddExample(Example("image-view-svg.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG));
58 58 demo.AddExample(Example("image-view-url.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL));
  59 + demo.AddExample(Example("layouting.example", DALI_DEMO_STR_TITLE_LAYOUTING));
59 60 demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
60 61 demo.AddExample(Example("magnifier.example", DALI_DEMO_STR_TITLE_MAGNIFIER));
61 62 demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
... ...
examples/layouting/layouting-examples.cpp
  View file @f80c790
... ... @@ -60,6 +60,7 @@ class LayoutingExample: public ConnectionTracker
60 60 // The Init signal is received once (only) during the Application lifetime
61 61  
62 62 auto stage = Stage::GetCurrent();
  63 + stage.KeyEventSignal().Connect( this, &LayoutingExample::OnKeyEvent );
63 64  
64 65 auto bg = ImageView::New( BACKGROUND_IMAGE );
65 66 bg.SetParentOrigin( ParentOrigin::CENTER );
... ...
resources/po/en_GB.po
  View file @f80c790
... ... @@ -82,6 +82,9 @@ msgstr &quot;Item View&quot;
82 82 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
83 83 msgstr "Lights and Shadows"
84 84  
  85 +msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
  86 +msgstr "Layouting"
  87 +
85 88 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
86 89 msgstr "Mesh Line"
87 90  
... ...
resources/po/en_US.po
  View file @f80c790
... ... @@ -85,6 +85,9 @@ msgstr &quot;Item View&quot;
85 85 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
86 86 msgstr "Lights and Shadows"
87 87  
  88 +msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
  89 +msgstr "Layouting"
  90 +
88 91 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
89 92 msgstr "Mesh Line"
90 93  
... ...
resources/po/ur.po
  View file @f80c790
... ... @@ -64,6 +64,9 @@ msgstr &quot;چیزوں کی فہرست&quot;
64 64 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
65 65 msgstr "روشنی اور سائے"
66 66  
  67 +msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
  68 +msgstr "تَرتيب"
  69 +
67 70 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
68 71 msgstr "لکیریں"
69 72  
... ...
shared/dali-demo-strings.h
  View file @f80c790
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2018 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -63,6 +63,7 @@ extern &quot;C&quot;
63 63 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL")
64 64 #define DALI_DEMO_STR_TITLE_ITEM_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
65 65 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
  66 +#define DALI_DEMO_STR_TITLE_LAYOUTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LAYOUTING")
66 67 #define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LINE_MESH")
67 68 #define DALI_DEMO_STR_TITLE_MAGNIFIER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
68 69 #define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_MORPH")
... ... @@ -137,6 +138,7 @@ extern &quot;C&quot;
137 138 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL "Image View URL"
138 139 #define DALI_DEMO_STR_TITLE_ITEM_VIEW "Item View"
139 140 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS "Lights and shadows"
  141 +#define DALI_DEMO_STR_TITLE_LAYOUTING "Layouting"
140 142 #define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line"
141 143 #define DALI_DEMO_STR_TITLE_MAGNIFIER "Magnifier"
142 144 #define DALI_DEMO_STR_TITLE_MESH_MORPH "Mesh Morph"
... ...