Peter M. Groen / dali-demo

Commit f8cea26ec5f02ad834651f3e10ad4b67149fdfe0

Authored by Agnelo Vaz
Committed by Adeel Kazmi
1 parent 9f57b162

Spliting dali-demo into examples-reel and demo 

Change-Id: I5c1c52ee969ac04a46412f8f6326a655fc7e63d5
Inline Side-by-side
Showing 12 changed files with 128 additions and 53 deletions
build/tizen/.gitignore
  View file @f8cea26
... ... @@ -2,6 +2,7 @@ CMakeCache.txt
2 2 CMakeFiles/
3 3 cmake_install.cmake
4 4 demo/dali-demo
  5 +examples-reel/dali-examples
5 6 install_manifest.txt
6 7 /demo/dali-demo
7 8 /demo/dali-examples
... ...
build/tizen/CMakeLists.txt
  View file @f8cea26
... ... @@ -172,8 +172,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werr
172 172 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
173 173  
174 174 INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
175   -#INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
176 175  
177 176 ADD_SUBDIRECTORY(demo)
178 177 ADD_SUBDIRECTORY(examples)
  178 +ADD_SUBDIRECTORY(examples-reel)
179 179 ADD_SUBDIRECTORY(builder)
... ...
build/tizen/demo/CMakeLists.txt
  View file @f8cea26
... ... @@ -2,7 +2,11 @@ SET(DEMO_SRC_DIR ${ROOT_SRC_DIR}/demo)
2 2  
3 3 AUX_SOURCE_DIRECTORY(${DEMO_SRC_DIR} DEMO_SRCS)
4 4  
5   -SET(DEMO_SRCS ${DEMO_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
  5 +SET(DEMO_SRCS
  6 + ${DEMO_SRCS}
  7 + "${ROOT_SRC_DIR}/shared/resources-location.cpp"
  8 + "${ROOT_SRC_DIR}/shared/dali-table-view.cpp"
  9 +)
6 10  
7 11 ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS})
8 12 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)
... ...
build/tizen/examples-reel/CMakeLists.txt 0 → 100644
  View file @f8cea26
  1 +SET(EXAMPLES_REEL_SRC_DIR ${ROOT_SRC_DIR}/examples-reel)
  2 +
  3 +AUX_SOURCE_DIRECTORY(${EXAMPLES_REEL_SRC_DIR} EXAMPLES_REEL_SRCS)
  4 +
  5 +SET(EXAMPLES_REEL_SRCS
  6 + ${EXAMPLES_REEL_SRCS}
  7 + "${ROOT_SRC_DIR}/shared/resources-location.cpp"
  8 + "${ROOT_SRC_DIR}/shared/dali-table-view.cpp"
  9 +)
  10 +
  11 +ADD_EXECUTABLE(dali-examples ${EXAMPLES_REEL_SRCS})
  12 +TARGET_LINK_LIBRARIES(dali-examples ${REQUIRED_PKGS_LDFLAGS} -pie)
  13 +
  14 +INSTALL(TARGETS dali-examples DESTINATION ${BINDIR})
  15 +
... ...
com.samsung.dali-demo.manifest-smack
  View file @f8cea26
... ... @@ -8,6 +8,9 @@
8 8 <assign>
9 9 <filesystem path="/usr/share/icons/com.samsung.dali-demo.png" label="_" />
10 10 </assign>
  11 + <assign>
  12 + <filesystem path="/usr/share/icons/dali-examples.png" label="_" />
  13 + </assign>
11 14 <request>
12 15 <domain name="com.samsung.dali-demo" />
13 16 </request>
... ...
com.samsung.dali-demo.xml
  View file @f8cea26
... ... @@ -10,6 +10,10 @@
10 10 <icon>/usr/share/icons/com.samsung.dali-demo.png</icon>
11 11 <label>DALi demo</label>
12 12 </ui-application>
  13 + <ui-application appid="com.samsung.dali-examples" exec="/usr/apps/com.samsung.dali-demo/bin/dali-examples" nodisplay="false" multiple="false" type="c++app" taskmanage="true">
  14 + <icon>/usr/share/icons/dali-examples.png</icon>
  15 + <label>DALi Examples</label>
  16 + </ui-application>
13 17 <ui-application appid="hello-world.example" exec="/usr/apps/com.samsung.dali-demo/bin/hello-world.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
14 18 <label>Hello World</label>
15 19 </ui-application>
... ...
demo/dali-demo.cpp
  View file @f8cea26
... ... @@ -19,7 +19,7 @@
19 19 #include <dali/dali.h>
20 20  
21 21 // INTERNAL INCLUDES
22   -#include "dali-table-view.h"
  22 +#include "shared/dali-table-view.h"
23 23 #include "shared/dali-demo-strings.h"
24 24  
25 25 using namespace Dali;
... ... @@ -36,60 +36,20 @@ int DALI_EXPORT_API main(int argc, char **argv)
36 36 // Create the demo launcher
37 37 DaliTableView demo(app);
38 38  
39   - demo.AddExample(Example("animated-images.example", DALI_DEMO_STR_TITLE_ANIMATED_IMAGES));
40   - demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
41   - demo.AddExample(Example("bubble-effect.example", DALI_DEMO_STR_TITLE_BUBBLES));
42 39 demo.AddExample(Example("blocks.example", DALI_DEMO_STR_TITLE_BLOCKS));
  40 + demo.AddExample(Example("bubble-effect.example", DALI_DEMO_STR_TITLE_BUBBLES));
  41 + demo.AddExample(Example("contact-cards.example", DALI_DEMO_STR_TITLE_CONTACT_CARDS));
43 42 demo.AddExample(Example("cube-transition-effect.example", DALI_DEMO_STR_TITLE_CUBE_TRANSITION));
44   - demo.AddExample(Example("dissolve-effect.example", DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION));
  43 + demo.AddExample(Example("fpp-game.example", DALI_DEMO_STR_TITLE_FPP_GAME));
45 44 demo.AddExample(Example("item-view.example", DALI_DEMO_STR_TITLE_ITEM_VIEW));
46   - demo.AddExample(Example("renderer-stencil.example", DALI_DEMO_STR_TITLE_RENDERER_STENCIL));
47   - demo.AddExample(Example("magnifier.example", DALI_DEMO_STR_TITLE_MAGNIFIER));
  45 + demo.AddExample(Example("mesh-visual.example", DALI_DEMO_STR_TITLE_MESH_VISUAL));
  46 + demo.AddExample(Example("metaball-explosion.example", DALI_DEMO_STR_TITLE_METABALL_EXPLOSION));
  47 + demo.AddExample(Example("metaball-refrac.example", DALI_DEMO_STR_TITLE_METABALL_REFRAC));
48 48 demo.AddExample(Example("motion-blur.example", DALI_DEMO_STR_TITLE_MOTION_BLUR));
49   - demo.AddExample(Example("motion-stretch.example", DALI_DEMO_STR_TITLE_MOTION_STRETCH));
50   - demo.AddExample(Example("page-turn-view.example", DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW));
51 49 demo.AddExample(Example("refraction-effect.example", DALI_DEMO_STR_TITLE_REFRACTION));
52   - demo.AddExample(Example("scroll-view.example", DALI_DEMO_STR_TITLE_SCROLL_VIEW));
  50 + demo.AddExample(Example("renderer-stencil.example", DALI_DEMO_STR_TITLE_RENDERER_STENCIL));
53 51 demo.AddExample(Example("shadows-and-lights.example", DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS));
54   - demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
55   - demo.AddExample(Example("image-scaling-and-filtering.example", DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING));
56   - demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING));
57   - demo.AddExample(Example("text-field.example", DALI_DEMO_STR_TITLE_TEXT_FIELD));
58   - demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
59   - demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
60   - demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
61   - demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING));
62   - demo.AddExample(Example("text-editor.example", DALI_DEMO_STR_TITLE_TEXT_EDITOR));
63   - demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE));
64   - demo.AddExample(Example("popup.example", DALI_DEMO_STR_TITLE_POPUP));
65   - demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS));
66   - demo.AddExample(Example("logging.example", DALI_DEMO_STR_TITLE_LOGGING));
67   - demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
68   - demo.AddExample(Example("mesh-sorting.example", DALI_DEMO_STR_TITLE_MESH_SORTING));
69   - demo.AddExample(Example("metaball-explosion.example", DALI_DEMO_STR_TITLE_METABALL_EXPLOSION));
70   - demo.AddExample(Example("metaball-refrac.example", DALI_DEMO_STR_TITLE_METABALL_REFRAC));
71   - demo.AddExample(Example("textured-mesh.example", DALI_DEMO_STR_TITLE_TEXTURED_MESH));
72   - demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
73   - demo.AddExample(Example("gradients.example", DALI_DEMO_STR_TITLE_COLOR_GRADIENT));
74   - demo.AddExample(Example("image-view.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW));
75   - demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA));
76   - demo.AddExample(Example("image-view-alpha-blending.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING));
77   - demo.AddExample(Example("image-view-svg.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG));
78   - demo.AddExample(Example("super-blur-bloom.example", DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM));
79   - demo.AddExample(Example("tilt.example", DALI_DEMO_STR_TITLE_TILT_SENSOR));
80   - demo.AddExample(Example("effects-view.example", DALI_DEMO_STR_TITLE_EFFECTS_VIEW));
81   - demo.AddExample(Example("native-image-source.example", DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE));
82   - demo.AddExample(Example("mesh-visual.example", DALI_DEMO_STR_TITLE_MESH_VISUAL));
83   - demo.AddExample(Example("primitive-shapes.example", DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES));
84   - demo.AddExample(Example("styling.example", DALI_DEMO_STR_TITLE_STYLING));
85 52 demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
86   - demo.AddExample(Example("transitions.example", DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS));
87   - demo.AddExample(Example("progress-bar.example", DALI_DEMO_STR_TITLE_PROGRESS_BAR));
88   - demo.AddExample(Example("contact-cards.example", DALI_DEMO_STR_TITLE_CONTACT_CARDS));
89   - demo.AddExample(Example("flex-container.example", DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND));
90   - demo.AddExample(Example("fpp-game.example", DALI_DEMO_STR_TITLE_FPP_GAME));
91   - demo.AddExample(Example("tooltip.example", DALI_DEMO_STR_TITLE_TOOLTIP));
92   - demo.AddExample(Example("clipping.example", DALI_DEMO_STR_TITLE_CLIPPING));
93 53  
94 54 demo.SortAlphabetically( true );
95 55  
... ...
examples-reel/dali-examples-reel.cpp 0 → 100644
  View file @f8cea26
  1 +/*
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +// EXTERNAL INCLUDES
  19 +#include <dali/dali.h>
  20 +
  21 +// INTERNAL INCLUDES
  22 +#include "shared/dali-table-view.h"
  23 +#include "shared/dali-demo-strings.h"
  24 +
  25 +using namespace Dali;
  26 +
  27 +int DALI_EXPORT_API main(int argc, char **argv)
  28 +{
  29 + // Configure gettext for internalization
  30 + bindtextdomain(DALI_DEMO_DOMAIN_LOCAL, DEMO_LOCALE_DIR);
  31 + textdomain(DALI_DEMO_DOMAIN_LOCAL);
  32 + setlocale(LC_ALL, DEMO_LANG);
  33 +
  34 + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
  35 +
  36 + // Create the demo launcher
  37 + DaliTableView demo(app);
  38 +
  39 + demo.AddExample(Example("animated-images.example", DALI_DEMO_STR_TITLE_ANIMATED_IMAGES));
  40 + demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
  41 + demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
  42 + demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS));
  43 + demo.AddExample(Example("clipping.example", DALI_DEMO_STR_TITLE_CLIPPING));
  44 + demo.AddExample(Example("dissolve-effect.example", DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION));
  45 + demo.AddExample(Example("effects-view.example", DALI_DEMO_STR_TITLE_EFFECTS_VIEW));
  46 + demo.AddExample(Example("flex-container.example", DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND));
  47 + demo.AddExample(Example("gradients.example", DALI_DEMO_STR_TITLE_COLOR_GRADIENT));
  48 + demo.AddExample(Example("image-scaling-and-filtering.example", DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING));
  49 + demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING));
  50 + demo.AddExample(Example("image-view.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW));
  51 + demo.AddExample(Example("image-view-alpha-blending.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_ALPHA_BLENDING));
  52 + demo.AddExample(Example("image-view-pixel-area.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_PIXEL_AREA));
  53 + demo.AddExample(Example("image-view-svg.example", DALI_DEMO_STR_TITLE_IMAGE_VIEW_SVG));
  54 + demo.AddExample(Example("line-mesh.example", DALI_DEMO_STR_TITLE_LINE_MESH));
  55 + demo.AddExample(Example("logging.example", DALI_DEMO_STR_TITLE_LOGGING));
  56 + demo.AddExample(Example("magnifier.example", DALI_DEMO_STR_TITLE_MAGNIFIER));
  57 + demo.AddExample(Example("mesh-morph.example", DALI_DEMO_STR_TITLE_MESH_MORPH));
  58 + demo.AddExample(Example("mesh-sorting.example", DALI_DEMO_STR_TITLE_MESH_SORTING));
  59 + demo.AddExample(Example("motion-stretch.example", DALI_DEMO_STR_TITLE_MOTION_STRETCH));
  60 + demo.AddExample(Example("native-image-source.example", DALI_DEMO_STR_TITLE_NATIVE_IMAGE_SOURCE));
  61 + demo.AddExample(Example("page-turn-view.example", DALI_DEMO_STR_TITLE_PAGE_TURN_VIEW));
  62 + demo.AddExample(Example("popup.example", DALI_DEMO_STR_TITLE_POPUP));
  63 + demo.AddExample(Example("primitive-shapes.example", DALI_DEMO_STR_TITLE_PRIMITIVE_SHAPES));
  64 + demo.AddExample(Example("progress-bar.example", DALI_DEMO_STR_TITLE_PROGRESS_BAR));
  65 + demo.AddExample(Example("scroll-view.example", DALI_DEMO_STR_TITLE_SCROLL_VIEW));
  66 + demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE));
  67 + demo.AddExample(Example("styling.example", DALI_DEMO_STR_TITLE_STYLING));
  68 + demo.AddExample(Example("super-blur-bloom.example", DALI_DEMO_STR_TITLE_SUPER_BLUR_BLOOM));
  69 + demo.AddExample(Example("text-editor.example", DALI_DEMO_STR_TITLE_TEXT_EDITOR));
  70 + demo.AddExample(Example("text-field.example", DALI_DEMO_STR_TITLE_TEXT_FIELD));
  71 + demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
  72 + demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
  73 + demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
  74 + demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING));
  75 + demo.AddExample(Example("textured-mesh.example", DALI_DEMO_STR_TITLE_TEXTURED_MESH));
  76 + demo.AddExample(Example("tilt.example", DALI_DEMO_STR_TITLE_TILT_SENSOR));
  77 + demo.AddExample(Example("tooltip.example", DALI_DEMO_STR_TITLE_TOOLTIP));
  78 + demo.AddExample(Example("transitions.example", DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS));
  79 +
  80 + demo.SortAlphabetically( true );
  81 +
  82 + // Start the event loop
  83 + app.MainLoop();
  84 +
  85 + return 0;
  86 +}
... ...
packaging/com.samsung.dali-demo.spec
  View file @f8cea26
... ... @@ -98,6 +98,7 @@ cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_di
98 98  
99 99 mkdir -p %{buildroot}%{dali_icon_dir}
100 100 mv %{buildroot}/%{dali_app_res_dir}/images/%{name}.png %{buildroot}%{dali_icon_dir}
  101 +mv %{buildroot}/%{dali_app_res_dir}/images/dali-examples.png %{buildroot}%{dali_icon_dir}
101 102  
102 103 %if 0%{?enable_dali_smack_rules} && !%{with wayland}
103 104 mkdir -p %{buildroot}%{smack_rule_dir}
... ... @@ -134,6 +135,7 @@ exit 0
134 135 %endif
135 136 %defattr(-,root,root,-)
136 137 %{dali_app_exe_dir}/dali-demo
  138 +%{dali_app_exe_dir}/dali-examples
137 139 %{dali_app_exe_dir}/*.example
138 140 %{dali_app_exe_dir}/dali-builder
139 141 %{dali_app_res_dir}/images/*
... ...
resources/images/dali-examples.png 0 → 100644
View file @f8cea26

15 KB
demo/dali-table-view.cpp renamed to shared/dali-table-view.cpp
  View file @f8cea26
demo/dali-table-view.h renamed to shared/dali-table-view.h
  View file @f8cea26
1   -#ifndef DALI_DEMO_H
2   -#define DALI_DEMO_H
  1 +#ifndef DALI_DEMO_TABLEVIEW_H
  2 +#define DALI_DEMO_TABLEVIEW_H
3 3  
4 4 /*
5 5 * Copyright (c) 2017 Samsung Electronics Co., Ltd.
... ... @@ -375,4 +375,4 @@ private:
375 375  
376 376 };
377 377  
378   -#endif // DALI_DEMO_H
  378 +#endif // DALI_DEMO_TABLEVIEW_H
... ...