From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 28 Feb 2017 13:39:43 +0000 (-0800)
Subject: Merge "A simple control using visuals" into devel/master
X-Git-Tag: dali_1.2.29~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b689cfe8d1517e8efcf76c482a7858b931a7732;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge "A simple control using visuals" into devel/master
---

4b689cfe8d1517e8efcf76c482a7858b931a7732
diff --cc shared/dali-demo-strings.h
index 06473352,7c2704e5..e8f490e5
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@@ -67,12 -67,9 +67,13 @@@ extern "C
  #define DALI_DEMO_STR_TITLE_POPUP                       dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_POPUP")
  #define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES")
  #define DALI_DEMO_STR_TITLE_PROGRESS_BAR                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_PROGRESS_BAR")
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_LINE         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_DRAW_LINE")
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_TRIANGLE     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_DRAW_TRIANGLE")
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_CUBE         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_DRAW_CUBE")
 +#define DALI_DEMO_STR_TITLE_RENDERING_TEXTURED_CUBE     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_TEXTURED_CUBE")
  #define DALI_DEMO_STR_TITLE_REFRACTION                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_REFRACTION")
  #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
+ #define DALI_DEMO_STR_TITLE_SIMPLE_VISUALS_CONTROL      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SIMPLE_VISUALS")
  #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
  #define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
  #define DALI_DEMO_STR_TITLE_SPARKLE                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SPARKLE")
@@@ -124,12 -121,9 +125,13 @@@
  #define DALI_DEMO_STR_TITLE_POPUP                       "Popup"
  #define DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES            "Primitive Shapes"
  #define DALI_DEMO_STR_TITLE_PROGRESS_BAR                "Progress Bar"
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_LINE         "Draw Line"
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_TRIANGLE     "Draw Triangle"
 +#define DALI_DEMO_STR_TITLE_RENDERING_DRAW_CUBE         "Draw Cube"
 +#define DALI_DEMO_STR_TITLE_RENDERING_TEXTURED_CUBE     "Textured Cube"
  #define DALI_DEMO_STR_TITLE_REFRACTION                  "Refract Effect"
  #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL            "Renderer Stencils"
+ #define DALI_DEMO_STR_TITLE_SIMPLE_VISUALS_CONTROL      "Simple Visuals Control"
  #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI             "Script Based UI"
  #define DALI_DEMO_STR_TITLE_SCROLL_VIEW                 "Scroll View"
  #define DALI_DEMO_STR_TITLE_SPARKLE                     "Sparkle"