DALi Version 1.9.24

[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 bc706fb..5765d9c
--- 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) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -89,6 +89,10 @@
  *    <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>
  *    <td>ScrollBar is a component that can be linked to the scrollable objects.</td>
  * </tr>
@@ -136,6 +140,10 @@
  *    <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
@@ -150,7 +158,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tizen-studio/native-tools/configuring-your-app/manifest-text-editor#feature"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://docs.tizen.org/application/tizen-studio/native-tools/manifest-text-editor#feature-element"><b>Feature Element</b>.</a>
  *
  * \endif
  *
@@ -172,6 +180,9 @@
  *     @defgroup dali_toolkit_controls_image_view Image View
  *     @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.
 
@@ -212,8 +223,10 @@
  *   @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