Peter M. Groen / dali-demo

Commit eecf6c78d76eda69386429e202e23b00ab608ae5

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 4b770add 1606c06c

Merge "Add Flexbox demo to the DALI demo launcher" into devel/master

Inline Side-by-side
Showing 12 changed files with 34 additions and 1 deletions
demo/dali-demo.cpp
  View file @eecf6c7
@@ -84,6 +84,7 @@ int DALI_EXPORT_API main(int argc, char **argv) @@ -84,6 +84,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
84 demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE)); 84 demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
85 demo.AddExample(Example("progress-bar.example", DALI_DEMO_STR_TITLE_PROGRESS_BAR)); 85 demo.AddExample(Example("progress-bar.example", DALI_DEMO_STR_TITLE_PROGRESS_BAR));
86 demo.AddExample(Example("contact-cards.example", DALI_DEMO_STR_TITLE_CONTACT_CARDS)); 86 demo.AddExample(Example("contact-cards.example", DALI_DEMO_STR_TITLE_CONTACT_CARDS));
  87 + demo.AddExample(Example("flex-container.example", DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND));
87 demo.AddExample(Example("fpp-game.example", DALI_DEMO_STR_TITLE_FPP_GAME)); 88 demo.AddExample(Example("fpp-game.example", DALI_DEMO_STR_TITLE_FPP_GAME));
88 89
89 demo.SortAlphabetically( true ); 90 demo.SortAlphabetically( true );
resources/po/as.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "অকৃতকাৰ্য্য হ" @@ -28,6 +28,9 @@ msgstr "অকৃতকাৰ্য্য হ"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "Emoji" 29 msgstr "Emoji"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox ডেমো"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "অনুবিম্ব ইজাৰ" 35 msgstr "অনুবিম্ব ইজাৰ"
33 36
resources/po/de.po
  View file @eecf6c7
@@ -31,6 +31,9 @@ msgstr "Emoji" @@ -31,6 +31,9 @@ msgstr "Emoji"
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "Bild Montage und Sampling" 32 msgstr "Bild Montage und Sampling"
33 33
  34 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  35 +msgstr "Flexbox Playground"
  36 +
34 msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING" 37 msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
35 msgstr "Bildskalierung" 38 msgstr "Bildskalierung"
36 39
resources/po/en_GB.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "Effects View" @@ -28,6 +28,9 @@ msgstr "Effects View"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "Emoji Text" 29 msgstr "Emoji Text"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox Playground"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "Image Fitting and Sampling" 35 msgstr "Image Fitting and Sampling"
33 36
resources/po/en_US.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "Effects View" @@ -28,6 +28,9 @@ msgstr "Effects View"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "Emoji Text" 29 msgstr "Emoji Text"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox Playground"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "Image Fitting and Sampling" 35 msgstr "Image Fitting and Sampling"
33 36
resources/po/es.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "Vista de efectos" @@ -28,6 +28,9 @@ msgstr "Vista de efectos"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "Texto con emojis" 29 msgstr "Texto con emojis"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox Playground"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "Modo de encaje y muestreo" 35 msgstr "Modo de encaje y muestreo"
33 36
resources/po/fi.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "Efektinäkymä" @@ -28,6 +28,9 @@ msgstr "Efektinäkymä"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "Teksti Hymiöillä" 29 msgstr "Teksti Hymiöillä"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox Testi Sovellus"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "Kuvien Sovitus ja Suodatus" 35 msgstr "Kuvien Sovitus ja Suodatus"
33 36
resources/po/ko.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "이펙트 뷰" @@ -28,6 +28,9 @@ msgstr "이펙트 뷰"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "이모티콘 텍스트" 29 msgstr "이모티콘 텍스트"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox 데모"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "이미지 조정 샘플링" 35 msgstr "이미지 조정 샘플링"
33 36
resources/po/ml.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "എഫക്റ്റുകൾ" @@ -28,6 +28,9 @@ msgstr "എഫക്റ്റുകൾ"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "ഇമോട്ടികോണുകൾ" 29 msgstr "ഇമോട്ടികോണുകൾ"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "ഫ്ലക്സ്ബോക്സിനുള്ള ഡെമോ"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "ചിത്രം ഉചിതമാണ് ആൻഡ് ഒരുപറ്റം" 35 msgstr "ചിത്രം ഉചിതമാണ് ആൻഡ് ഒരുപറ്റം"
33 36
resources/po/ur.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "اثرات" @@ -28,6 +28,9 @@ msgstr "اثرات"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "اموٹکان" 29 msgstr "اموٹکان"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "فلیکس باکس ڈیمو"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "تصویر فٹنگ" 35 msgstr "تصویر فٹنگ"
33 36
resources/po/zn_CH.po
  View file @eecf6c7
@@ -28,6 +28,9 @@ msgstr "效果视图" @@ -28,6 +28,9 @@ msgstr "效果视图"
28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT" 28 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
29 msgstr "表情符号" 29 msgstr "表情符号"
30 30
  31 +msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
  32 +msgstr "Flexbox演示"
  33 +
31 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING" 34 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
32 msgstr "图像填充及采样" 35 msgstr "图像填充及采样"
33 36
@@ -146,4 +149,4 @@ msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR" @@ -146,4 +149,4 @@ msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
146 msgstr "倾斜传感器" 149 msgstr "倾斜传感器"
147 150
148 msgid "DALI_DEMO_STR_TITLE_FPP_GAME" 151 msgid "DALI_DEMO_STR_TITLE_FPP_GAME"
149 -msgstr "FPP遊戲" 152 +msgstr "FPP游戏"
shared/dali-demo-strings.h
  View file @eecf6c7
@@ -42,6 +42,7 @@ extern "C" @@ -42,6 +42,7 @@ extern "C"
42 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION") 42 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")
43 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EFFECTS_VIEW") 43 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EFFECTS_VIEW")
44 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT") 44 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
  45 +#define DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND")
45 #define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING") 46 #define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")
46 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING") 47 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
47 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW") 48 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW")
@@ -94,6 +95,7 @@ extern "C" @@ -94,6 +95,7 @@ extern "C"
94 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Effect" 95 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION "Dissolve Effect"
95 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW "Effects View" 96 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW "Effects View"
96 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text" 97 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
  98 +#define DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND "Flexbox Playground"
97 #define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING "Image Fitting and Sampling" 99 #define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING "Image Fitting and Sampling"
98 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Grid" 100 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING "Image Scaling Grid"
99 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View" 101 #define DALI_DEMO_STR_TITLE_IMAGE_VIEW "Image View"