projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SVACE issue
[platform/core/uifw/dali-toolkit.git]
/
doc
/
dali-toolkit-doc.h
diff --git
a/doc/dali-toolkit-doc.h
b/doc/dali-toolkit-doc.h
old mode 100644
(file)
new mode 100755
(executable)
index
bf41fae
..
e8cae72
--- a/
doc/dali-toolkit-doc.h
+++ b/
doc/dali-toolkit-doc.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_DOC_H__
-#define
__DALI_TOOLKIT_DOC_H__
+#ifndef
DALI_TOOLKIT_DOC_H
+#define
DALI_TOOLKIT_DOC_H
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-86,7
+86,11
@@
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_image_view</td>
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_image_view</td>
- * <td>ImageView is a control displying an image.</td>
+ * <td>ImageView is a control displaying an image.</td>
+ * </tr>
+ * <tr>
+ * <td style="padding-left:1em">@ref dali_toolkit_controls_model3d_view</td>
+ * <td>Model3dView is a control for displaying 3d geometry.</td>
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
* </tr>
* <tr>
* <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
@@
-125,6
+129,10
@@
* <td>Slider is a control to enable sliding an indicator between two values.</td>
* </tr>
* <tr>
* <td>Slider is a control to enable sliding an indicator between two values.</td>
* </tr>
* <tr>
+ * <td style="padding-left:1em">@ref dali_toolkit_controls_progress_bar</td>
+ * <td>ProgressBar is a control to give the user an indication of the progress of an operation.</td>
+ * </tr>
+ * <tr>
* <td>@ref dali_toolkit_managers</td>
* <td>Singleton classes for managing application-wide functionalities.</td>
* </tr>
* <td>@ref dali_toolkit_managers</td>
* <td>Singleton classes for managing application-wide functionalities.</td>
* </tr>
@@
-132,6
+140,10
@@
* <td>@ref dali_toolkit_visuals</td>
* <td>Visuals can control rendering the contents as using Property.</td>
* </tr>
* <td>@ref dali_toolkit_visuals</td>
* <td>Visuals can control rendering the contents as using Property.</td>
* </tr>
+ * <tr>
+ * <td>@ref dali_toolkit_image_loader</td>
+ * <td>The ImageLoader is used to load pixel data from a URL.</td>
+ * </tr>
* </table>
*
* \ifnot show_tizen_feature
* </table>
*
* \ifnot show_tizen_feature
@@
-166,7
+178,10
@@
* @brief GaussianBlurView provides a render process that blurs an image.
* @defgroup dali_toolkit_controls_image_view Image View
* @brief GaussianBlurView provides a render process that blurs an image.
* @defgroup dali_toolkit_controls_image_view Image View
- * @brief ImageView is a control displying an image.
+ * @brief ImageView is a control displaying an image.
+
+ * @defgroup dali_toolkit_controls_model3d_view Model3dView
+ * @brief Model3dView is a control for displaying 3d geometry.
* @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
* @brief ScrollBar is a component that can be linked to the scrollable objects.
* @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
* @brief ScrollBar is a component that can be linked to the scrollable objects.
@@
-197,6
+212,9
@@
* @defgroup dali_toolkit_controls_slider Slider
* @brief Slider is a control to enable sliding an indicator between two values.
* @defgroup dali_toolkit_controls_slider Slider
* @brief Slider is a control to enable sliding an indicator between two values.
+ * @defgroup dali_toolkit_controls_progress_bar Progress Bar
+ * @brief ProgressBar is a control to give the user an indication of the progress of an operation.
+
* @}
* @defgroup dali_toolkit_managers Managers
* @}
* @defgroup dali_toolkit_managers Managers
@@
-205,8
+223,10
@@
* @defgroup dali_toolkit_visuals Visuals
* @brief Visuals can control rendering the contents as using Property.
* @defgroup dali_toolkit_visuals Visuals
* @brief Visuals can control rendering the contents as using Property.
+ * @defgroup dali_toolkit_image_loader Image Loader
+ * @brief The ImageLoader is used to load pixel data from a URL.
+
* @}
*/
* @}
*/
-
-#endif /* __DALI_TOOLKIT_DOC_H__ */
+#endif // DALI_TOOLKIT_DOC_H