Minor string clean-up

Change-Id: Ib490798b013cf1847fb867dd478a571d28e6fc73

diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index 76273bb..a0ae7d1 100644 (file)
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -48,10 +48,10 @@ int main(int argc, char **argv)
   demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
   demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING));
   demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
-  demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)/*TODO - new string*/);
-  demo.AddExample(Example("text-label-emojis.example", "Emoji Text")/*TODO - new string*/);
-  demo.AddExample(Example("animated-shapes.example", "Animated Shapes"));
-  demo.AddExample(Example("path-animation.example", "Path Animation"));
+  demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
+  demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
+  demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
+  demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));
   app.MainLoop();
 
   return 0;

diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index f8021d0..6354fa9 100644 (file)
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -49,26 +49,34 @@ extern "C"
 #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_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
+#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
+#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)
+#define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)
 
 #else // !INTERNATIONALIZATION_ENABLED
 
-#define DALI_DEMO_STR_TITLE_BUBBLES             "Bubbles"
-#define DALI_DEMO_STR_TITLE_BLOCKS              "Blocks"
-#define DALI_DEMO_STR_TITLE_CLUSTER             "Cluster"
-#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION     "Cube Transition"
-#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Transition"
-#define DALI_DEMO_STR_TITLE_ITEM_VIEW           "Item View"
-#define DALI_DEMO_STR_TITLE_MAGNIFIER           "Magnifier"
-#define DALI_DEMO_STR_TITLE_MOTION_BLUR         "Motion Blur"
-#define DALI_DEMO_STR_TITLE_MOTION_STRETCH      "Motion Stretch"
-#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW      "Page Turn View"
-#define DALI_DEMO_STR_TITLE_RADIAL_MENU         "Radial Menu"
-#define DALI_DEMO_STR_TITLE_REFRACTION          "Refraction"
-#define DALI_DEMO_STR_TITLE_SCROLL_VIEW         "Scroll View"
-#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS  "Lights and shadows"
-#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI     "Script Based UI"
-#define DALI_DEMO_STR_TITLE_IMAGE_SCALING       "Image Scaling Modes"
-#define DALI_DEMO_STR_TITLE_TEXT_LABEL          "Text Label"
+#define DALI_DEMO_STR_TITLE_BUBBLES                   "Bubbles"
+#define DALI_DEMO_STR_TITLE_BLOCKS                    "Blocks"
+#define DALI_DEMO_STR_TITLE_CLUSTER                   "Cluster"
+#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION           "Cube Effect"
+#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION       "Dissolve Effect"
+#define DALI_DEMO_STR_TITLE_ITEM_VIEW                 "Item View"
+#define DALI_DEMO_STR_TITLE_MAGNIFIER                 "Magnifier"
+#define DALI_DEMO_STR_TITLE_MOTION_BLUR               "Motion Blur"
+#define DALI_DEMO_STR_TITLE_MOTION_STRETCH            "Motion Stretch"
+#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW            "Page Turn View"
+#define DALI_DEMO_STR_TITLE_RADIAL_MENU               "Radial Menu"
+#define DALI_DEMO_STR_TITLE_REFRACTION                "Refract Effect"
+#define DALI_DEMO_STR_TITLE_SCROLL_VIEW               "Scroll View"
+#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS        "Lights and shadows"
+#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI           "Script Based UI"
+#define DALI_DEMO_STR_TITLE_IMAGE_SCALING             "Image Scaling Modes"
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL                "Text Label"
+#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
+#define DALI_DEMO_STR_TITLE_EMOJI_TEXT                "Emoji Text"
+#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES           "Animated Shapes"
+#define DALI_DEMO_STR_TITLE_PATH_ANIMATION            "Animated Path"
 
 #endif
 

diff --git a/shared/view.h b/shared/view.h
index 64e97fa..73cb4a2 100644 (file)
--- a/shared/view.h
+++ b/shared/view.h
@@ -45,7 +45,7 @@ const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f );
 
 const char*                   DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
 const char*                   DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
-const float                   DEFAULT_TEXT_STYLE_POINT_SIZE( 16.0f );
+const float                   DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
 const Dali::Vector4           DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
 
 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);
@@ -99,7 +99,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar& toolBar,
     label.SetProperty( Dali::Toolkit::TextLabel::Property::ALIGNMENT, "CENTER" );
     label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_FAMILY, DEFAULT_TEXT_STYLE_FONT_FAMILY );
     label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_STYLE, DEFAULT_TEXT_STYLE_FONT_STYLE );
-    label.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE, DEFAULT_TEXT_STYLE_POINT_SIZE );
+    label.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE, ScalePointSize(DEFAULT_TEXT_STYLE_POINT_SIZE) );
     label.SetColor( DEFAULT_TEXT_STYLE_COLOR );
     toolBarLayer.Add( label );
   }