Added layouting example to dali-examples

Change-Id: I2858ce28fcd0c025cf497046453eaca7d4321625

diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml
index c438eb6951029ee814083cd5eab83a2e7d390f2e..44c138d353f97587d15789721413107a132108f5 100644 (file)
--- a/com.samsung.dali-demo.xml
+++ b/com.samsung.dali-demo.xml
@@ -248,8 +248,13 @@
                <label>Card Active App</label>
        </ui-application>
        <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">
-               <label>Image Policies</label></ui-application>
-       <privileges>
+    <label>Image Policies</label>
+  </ui-application>
+       <ui-application appid="layouting.example" exec="/usr/apps/com.samsung.dali-demo/bin/layouting.example" nodisplay="true" multiple="false" taskmanage="true" type="c++app">
+    <label>Layouting</label>
+  </ui-application>
+
+  <privileges>
                <privilege>http://tizen.org/privilege/mediastorage</privilege>
                <privilege>http://tizen.org/privilege/externalstorage</privilege>
                <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>

diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp
index a90d8f0898606469a522a60aa077bb7b76444833..026aab9c10150cef36ed303f6d5460b3ccd219f1 100644 (file)
--- a/examples-reel/dali-examples-reel.cpp
+++ b/examples-reel/dali-examples-reel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * 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)
   demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA));
   demo.AddExample(Example("image-view-svg.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG));
   demo.AddExample(Example("image-view-url.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL));
+  demo.AddExample(Example("layouting.example", DALI_DEMO_STR_TITLE_LAYOUTING));
   demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
   demo.AddExample(Example("magnifier.example", DALI_DEMO_STR_TITLE_MAGNIFIER));
   demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));

diff --git a/examples/layouting/layouting-examples.cpp b/examples/layouting/layouting-examples.cpp
index c41cba54c372e4ec383d16a59bc291633cf113da..df94e65f4ab7ff0a495f48054d83efb82e762fba 100644 (file)
--- a/examples/layouting/layouting-examples.cpp
+++ b/examples/layouting/layouting-examples.cpp
@@ -60,6 +60,7 @@ class LayoutingExample: public ConnectionTracker
     // The Init signal is received once (only) during the Application lifetime
 
     auto stage = Stage::GetCurrent();
+    stage.KeyEventSignal().Connect( this, &LayoutingExample::OnKeyEvent );
 
     auto bg = ImageView::New( BACKGROUND_IMAGE );
     bg.SetParentOrigin( ParentOrigin::CENTER );

diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index 1df6bd34d6605a64ddc05faa672792bb76ae0df1..77d0564575003a16eb99b4f95d9290fb56624086 100755 (executable)
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -82,6 +82,9 @@ msgstr "Item View"
 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
 msgstr "Lights and Shadows"
 
+msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
+msgstr "Layouting"
+
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Mesh Line"
 

diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 49bacb33214e36ae098ac204428cf665e487d76d..c9709125309878ca42bf349c23219b2732bb4872 100755 (executable)
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -85,6 +85,9 @@ msgstr "Item View"
 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
 msgstr "Lights and Shadows"
 
+msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
+msgstr "Layouting"
+
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "Mesh Line"
 

diff --git a/resources/po/ur.po b/resources/po/ur.po
index c3c76ad900b4d6770001fe2802988c473b7b3193..5b4107508a08439d87d7d341be575cce5152efe2 100755 (executable)
--- a/resources/po/ur.po
+++ b/resources/po/ur.po
@@ -64,6 +64,9 @@ msgstr "چیزوں کی فہرست"
 msgid "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS"
 msgstr "روشنی اور سائے"
 
+msgid "DALI_DEMO_STR_TITLE_LAYOUTING"
+msgstr "تَرتيب"
+
 msgid "DALI_DEMO_STR_TITLE_LINE_MESH"
 msgstr "لکیریں"
 

diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 26f2ee2cb24072b33695ab6e0e0eda5f02f99775..26299f081e3a1836c625ac496182888d282aa64f 100644 (file)
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,6 +63,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL              dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL")
 #define DALI_DEMO_STR_TITLE_ITEM_VIEW                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ITEM_VIEW")
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
+#define DALI_DEMO_STR_TITLE_LAYOUTING                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LAYOUTING")
 #define DALI_DEMO_STR_TITLE_LINE_MESH                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LINE_MESH")
 #define DALI_DEMO_STR_TITLE_MAGNIFIER                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MAGNIFIER")
 #define DALI_DEMO_STR_TITLE_MESH_MORPH                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_MESH_MORPH")
@@ -137,6 +138,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW_URL              "Image View URL"
 #define DALI_DEMO_STR_TITLE_ITEM_VIEW                   "Item View"
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS          "Lights and shadows"
+#define DALI_DEMO_STR_TITLE_LAYOUTING                   "Layouting"
 #define DALI_DEMO_STR_TITLE_LINE_MESH                   "Mesh Line"
 #define DALI_DEMO_STR_TITLE_MAGNIFIER                   "Magnifier"
 #define DALI_DEMO_STR_TITLE_MESH_MORPH                  "Mesh Morph"