From: Seoyeon Kim Date: Fri, 9 Dec 2016 06:40:33 +0000 (-0800) Subject: Merge "Add deprecated tag and missed doxygen" into devel/master X-Git-Tag: dali_1.2.19~26 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=049a2eb5fc5f2fbd180ab85a72da8ca923fbf6b5;hp=45ecb0b3535fc8588ae5d95d2a846c90422c3a4d Merge "Add deprecated tag and missed doxygen" into devel/master --- diff --git a/build/tizen/docs-internal/dali-internal.doxy.in b/build/tizen/docs-internal/dali-internal.doxy.in index fce6213..173bfed 100644 --- a/build/tizen/docs-internal/dali-internal.doxy.in +++ b/build/tizen/docs-internal/dali-internal.doxy.in @@ -362,6 +362,7 @@ ALIASES += SINCE_1_2_14="@since 1.2.14" ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 1.0" ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 1.1" +ALIASES += DEPRECATED_1_2_8="@deprecated Deprecated since 1.2.8" ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 1.2.10" ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 1.2" @@ -390,6 +391,7 @@ ALIASES += REMARK_STORAGE="" ## Thus deprecated APIs in DALi 1.0.xx will be deprecated in Tizen 3.0. #ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 3.0, DALi version 1.0" #ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 3.0, DALi version 1.1" +#ALIASES += DEPRECATED_1_2_8="@deprecated Deprecated since 3.0, DALi version 1.2.8" #ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 3.0, DALi version 1.2.10" #ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 4.0, DALi version 1.2" diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index 69e8acb..9eaa3a2 100644 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -355,6 +355,7 @@ ALIASES += SINCE_1_2_14="@since 1.2.14" ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 1.0" ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 1.1" +ALIASES += DEPRECATED_1_2_8="@deprecated Deprecated since 1.2.8" ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 1.2.10" ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 1.2" @@ -383,6 +384,7 @@ ALIASES += REMARK_STORAGE="" ## Thus deprecated APIs in DALi 1.0.xx will be deprecated in Tizen 3.0. #ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 3.0, DALi version 1.0" #ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 3.0, DALi version 1.1" +#ALIASES += DEPRECATED_1_2_8="@deprecated Deprecated since 3.0, DALi version 1.2.8" #ALIASES += DEPRECATED_1_2_10="@deprecated Deprecated since 3.0, DALi version 1.2.10" #ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 4.0, DALi version 1.2" diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index 0ffad99..1cd6f6e 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -102,6 +102,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Button class. + * @SINCE_1_0.0 + */ enum { DISABLED = PROPERTY_START_INDEX, ///< name "disabled", @see SetDisabled(), type bool @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index 8720e5c..8551851 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -105,6 +105,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the PushButton class. + * @SINCE_1_0.0 + */ enum { UNSELECTED_ICON = PROPERTY_START_INDEX, ///< Property, name "unselectedIcon", type std::string @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 86ea607..e9200d6 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -89,6 +89,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Control class. + * @SINCE_1_0.0 + */ enum { /** @@ -329,7 +333,7 @@ public: Vector4 GetBackgroundColor() const; /** - * @DEPRECATED_1_2.8, use Property::BACKGROUND instead + * @DEPRECATED_1_2_8, use Property::BACKGROUND instead * * @brief Sets an image as the background of the control. * diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h index 375b2ce..ef86a70 100644 --- a/dali-toolkit/public-api/controls/flex-container/flex-container.h +++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h @@ -190,6 +190,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the FlexContainer class. + * @SINCE_1_1.35 + */ enum { // Event side properties @@ -208,6 +212,10 @@ public: */ struct ChildProperty { + /** + * @brief An enumeration of child properties belonging to the FlexContainer class. + * @SINCE_1_1.35 + */ enum { // Event side child properties diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index 4585657..3d4c361 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -70,6 +70,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the ImageView class. + * @SINCE_1_0.0 + */ enum { // Event side properties @@ -125,7 +129,7 @@ public: static ImageView New(); /** - * @DEPRECATED_1_2.8, use New( const std::string& ) instead. + * @DEPRECATED_1_2_8, use New( const std::string& ) instead. * * @brief Create an initialized ImageView from an Image instance. * @@ -206,7 +210,7 @@ public: static ImageView DownCast( BaseHandle handle ); /** - * @DEPRECATED_1_2.8, use SetImage( const std::string& ) instead. + * @DEPRECATED_1_2_8, use SetImage( const std::string& ) instead. * * @brief Sets this ImageView from an Image instance. * diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h index 3aa186d..160ca96 100644 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -62,6 +62,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the TextLabel class. + * @SINCE_1_1.4 + */ enum { GEOMETRY_URL = PROPERTY_START_INDEX, ///< name "geometryUrl", The path to the geometry file, type STRING @SINCE_1_1.4 diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index ef50b30..dffb7a4 100755 --- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -71,6 +71,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the ScrollBar class. + * @SINCE_1_0.0 + */ enum { /** diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h index ae98934..d49d32c 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h @@ -87,6 +87,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the ScrollView class. + * @SINCE_1_0.0 + */ enum { // Event side properties diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index a4545a8..0028cd7 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -497,6 +497,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the ScrollView class. + * @SINCE_1_0.0 + */ enum { // Event side properties diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h index c86c6c7..df051bd 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -73,6 +73,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Scrollable class. + * @SINCE_1_0.0 + */ enum { // Event side properties diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index 2b35742..851efe8 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -69,6 +69,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Slider class. + * @SINCE_1_1.39 + */ enum { diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h index 8af9427..be37f50 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -128,6 +128,11 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the TableView class. + * + * @SINCE_1_0.0 + */ enum { ROWS = PROPERTY_START_INDEX, ///< name "rows", type unsigned int @SINCE_1_0.0 @@ -144,6 +149,10 @@ public: */ struct ChildProperty { + /** + * @brief An enumeration of child properties belonging to the TableView class. + * @SINCE_1_1.36 + */ enum { CELL_INDEX = CHILD_PROPERTY_START_INDEX, ///< name "cellIndex", The top-left cell this child occupies, if not set, the first available cell is used, type VECTOR2 @SINCE_1_1.36 diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index b398d05..8108e58 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -66,6 +66,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the TextEditor class. + * @SINCE_1_1.37 + */ enum { RENDERING_BACKEND = PROPERTY_START_INDEX, ///< name "renderingBackend", The type or rendering e.g. bitmap-based, type INT @SINCE_1_1.37 @@ -118,6 +122,11 @@ public: */ struct InputStyle { + /** + * @brief Mask used by the signal InputStyleChangedSignal(). + * + * @SINCE_1_2_2 + */ enum Mask { NONE = 0x0000, ///< @SINCE_1_2_2 diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index f678374..57828f2 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -66,6 +66,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the TextField class. + * @SINCE_1_0.0 + */ enum { RENDERING_BACKEND = PROPERTY_START_INDEX, ///< name "renderingBackend", The type or rendering e.g. bitmap-based, type INT @SINCE_1_0.0 @@ -137,6 +141,11 @@ public: */ struct InputStyle { + /** + * @brief Mask used by the signal InputStyleChangedSignal(). + * + * @SINCE_1_2_2 + */ enum Mask { NONE = 0x0000, ///< @SINCE_1_2_2 diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h index 829d086..2ac2e4f 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -83,6 +83,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the TextLabel class. + * @SINCE_1_0.0 + */ enum { /**