Peter M. Groen / dali-demo

Commit d63ad26a0342b1a7e6ce0a7673acfbdcca94c760

Authored by Francisco Santos
1 parent 052676a7

Update dali-demo menu. 

Change-Id: I3e62364b420a9df327292dc877abb2b69ec6b21e
Inline Side-by-side
Showing 2 changed files with 12 additions and 6 deletions
demo/dali-demo.cpp
  View file @d63ad26
@@ -57,11 +57,13 @@ int main(int argc, char **argv) @@ -57,11 +57,13 @@ int main(int argc, char **argv)
57 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)); 57 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
58 demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE)); 58 demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
59 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); 59 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
60 - demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));  
61 - demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));  
62 demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)); 60 demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE));
63 demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS)); 61 demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS));
64 demo.AddExample(Example("logging.example", DALI_DEMO_STR_TITLE_LOGGING)); 62 demo.AddExample(Example("logging.example", DALI_DEMO_STR_TITLE_LOGGING));
  63 + demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
  64 + demo.AddExample(Example("mesh-sorting.example", DALI_DEMO_STR_TITLE_MESH_SORTING));
  65 + demo.AddExample(Example("textured-mesh.example", DALI_DEMO_STR_TITLE_TEXTURED_MESH));
  66 + demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
65 67
66 demo.SortAlphabetically( true ); 68 demo.SortAlphabetically( true );
67 69
shared/dali-demo-strings.h
  View file @d63ad26
@@ -53,11 +53,13 @@ extern "C" @@ -53,11 +53,13 @@ extern "C"
53 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL") 53 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
54 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE") 54 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
55 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT") 55 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
56 -#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)  
57 -#define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)  
58 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE) 56 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)
59 #define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS") 57 #define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")
60 #define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING") 58 #define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
  59 +#define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_MORPH")
  60 +#define DALI_DEMO_STR_TITLE_MESH_SORTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_SORTING")
  61 +#define DALI_DEMO_STR_TITLE_TEXTURED_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TEXTURED_MESH")
  62 +#define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_LINE_MESH")
61 63
62 #else // !INTERNATIONALIZATION_ENABLED 64 #else // !INTERNATIONALIZATION_ENABLED
63 65
@@ -82,11 +84,13 @@ extern "C" @@ -82,11 +84,13 @@ extern "C"
82 #define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label" 84 #define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label"
83 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts" 85 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
84 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text" 86 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
85 -#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes"  
86 -#define DALI_DEMO_STR_TITLE_PATH_ANIMATION "Animated Path"  
87 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size" 87 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size"
88 #define DALI_DEMO_STR_TITLE_BUTTONS "Buttons" 88 #define DALI_DEMO_STR_TITLE_BUTTONS "Buttons"
89 #define DALI_DEMO_STR_TITLE_LOGGING "Logging" 89 #define DALI_DEMO_STR_TITLE_LOGGING "Logging"
  90 +#define DALI_DEMO_STR_TITLE_MESH_MORPH "Mesh Morph"
  91 +#define DALI_DEMO_STR_TITLE_MESH_SORTING "Mesh Sorting"
  92 +#define DALI_DEMO_STR_TITLE_TEXTURED_MESH "Mesh Texture"
  93 +#define DALI_DEMO_STR_TITLE_LINE_MESH "Mesh Line"
90 94
91 #endif 95 #endif
92 96