Peter M. Groen / dali-demo

Commit 73160555ec05f3dd450381a590f8f815c4af41dd

Authored by Paul Wisbey
1 parent 6eb20aed

Minor string clean-up 

Change-Id: Ib490798b013cf1847fb867dd478a571d28e6fc73
Inline Side-by-side
Showing 3 changed files with 31 additions and 23 deletions
demo/dali-demo.cpp
  View file @7316055
@@ -48,10 +48,10 @@ int main(int argc, char **argv) @@ -48,10 +48,10 @@ int main(int argc, char **argv)
48 demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI)); 48 demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
49 demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING)); 49 demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING));
50 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)); 50 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
51 - demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)/*TODO - new string*/);  
52 - demo.AddExample(Example("text-label-emojis.example", "Emoji Text")/*TODO - new string*/);  
53 - demo.AddExample(Example("animated-shapes.example", "Animated Shapes"));  
54 - demo.AddExample(Example("path-animation.example", "Path Animation")); 51 + demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
  52 + demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
  53 + demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
  54 + demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));
55 app.MainLoop(); 55 app.MainLoop();
56 56
57 return 0; 57 return 0;
shared/dali-demo-strings.h
  View file @7316055
@@ -49,26 +49,34 @@ extern "C" @@ -49,26 +49,34 @@ extern "C"
49 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI") 49 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
50 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING") 50 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
51 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL") 51 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
  52 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
  53 +#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
  54 +#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)
  55 +#define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)
52 56
53 #else // !INTERNATIONALIZATION_ENABLED 57 #else // !INTERNATIONALIZATION_ENABLED
54 58
55 -#define DALI_DEMO_STR_TITLE_BUBBLES "Bubbles"  
56 -#define DALI_DEMO_STR_TITLE_BLOCKS "Blocks"  
57 -#define DALI_DEMO_STR_TITLE_CLUSTER "Cluster"  
58 -#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION "Cube Transition"  
59 -#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Transition"  
60 -#define DALI_DEMO_STR_TITLE_ITEM_VIEW "Item View"  
61 -#define DALI_DEMO_STR_TITLE_MAGNIFIER "Magnifier"  
62 -#define DALI_DEMO_STR_TITLE_MOTION_BLUR "Motion Blur"  
63 -#define DALI_DEMO_STR_TITLE_MOTION_STRETCH "Motion Stretch"  
64 -#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW "Page Turn View"  
65 -#define DALI_DEMO_STR_TITLE_RADIAL_MENU "Radial Menu"  
66 -#define DALI_DEMO_STR_TITLE_REFRACTION "Refraction"  
67 -#define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"  
68 -#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS "Lights and shadows"  
69 -#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"  
70 -#define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Modes"  
71 -#define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label" 59 +#define DALI_DEMO_STR_TITLE_BUBBLES "Bubbles"
  60 +#define DALI_DEMO_STR_TITLE_BLOCKS "Blocks"
  61 +#define DALI_DEMO_STR_TITLE_CLUSTER "Cluster"
  62 +#define DALI_DEMO_STR_TITLE_CUBE_TRANSITION "Cube Effect"
  63 +#define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Effect"
  64 +#define DALI_DEMO_STR_TITLE_ITEM_VIEW "Item View"
  65 +#define DALI_DEMO_STR_TITLE_MAGNIFIER "Magnifier"
  66 +#define DALI_DEMO_STR_TITLE_MOTION_BLUR "Motion Blur"
  67 +#define DALI_DEMO_STR_TITLE_MOTION_STRETCH "Motion Stretch"
  68 +#define DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW "Page Turn View"
  69 +#define DALI_DEMO_STR_TITLE_RADIAL_MENU "Radial Menu"
  70 +#define DALI_DEMO_STR_TITLE_REFRACTION "Refract Effect"
  71 +#define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"
  72 +#define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS "Lights and shadows"
  73 +#define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"
  74 +#define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Modes"
  75 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label"
  76 +#define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
  77 +#define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
  78 +#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes"
  79 +#define DALI_DEMO_STR_TITLE_PATH_ANIMATION "Animated Path"
72 80
73 #endif 81 #endif
74 82
shared/view.h
  View file @7316055
@@ -45,7 +45,7 @@ const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f ); @@ -45,7 +45,7 @@ const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f );
45 45
46 const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue"); 46 const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
47 const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular"); 47 const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
48 -const float DEFAULT_TEXT_STYLE_POINT_SIZE( 16.0f ); 48 +const float DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
49 const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f); 49 const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
50 50
51 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f); 51 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, @@ -99,7 +99,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar& toolBar,
99 label.SetProperty( Dali::Toolkit::TextLabel::Property::ALIGNMENT, "CENTER" ); 99 label.SetProperty( Dali::Toolkit::TextLabel::Property::ALIGNMENT, "CENTER" );
100 label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_FAMILY, DEFAULT_TEXT_STYLE_FONT_FAMILY ); 100 label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_FAMILY, DEFAULT_TEXT_STYLE_FONT_FAMILY );
101 label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_STYLE, DEFAULT_TEXT_STYLE_FONT_STYLE ); 101 label.SetProperty( Dali::Toolkit::TextLabel::Property::FONT_STYLE, DEFAULT_TEXT_STYLE_FONT_STYLE );
102 - label.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE, DEFAULT_TEXT_STYLE_POINT_SIZE ); 102 + label.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE, ScalePointSize(DEFAULT_TEXT_STYLE_POINT_SIZE) );
103 label.SetColor( DEFAULT_TEXT_STYLE_COLOR ); 103 label.SetColor( DEFAULT_TEXT_STYLE_COLOR );
104 toolBarLayer.Add( label ); 104 toolBarLayer.Add( label );
105 } 105 }