X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fpush-button.h;h=48ad719505ae697546c3d4a91f00ff145d981ae6;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hp=0e53a9c6b1a8c9c96f479074fdda2e195de51870;hpb=06e563f8a982e25a0efe2d91c794657dc8e4bc4a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h
index 0e53a9c..48ad719 100644
--- a/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -35,6 +35,10 @@ namespace Internal DALI_INTERNAL
 
 class PushButton;
 }
+/**
+ * @addtogroup dali_toolkit_controls_buttons
+ * @{
+ */
 
 /**
  * @brief A PushButton changes its appearance when is pressed and returns to its original when is released.
@@ -64,11 +68,11 @@ public:
   {
     enum
     {
-      UNSELECTED_ICON = PROPERTY_START_INDEX, ///< Property, name "unselected-icon", type std::string
-      SELECTED_ICON,                          ///< Property, name "selected-icon",   type std::string
-      ICON_ALIGNMENT,                         ///< Property, name "icon-alignment",  type std::string
-      LABEL_PADDING,                          ///< Property, name "label-padding",   type Vector4
-      ICON_PADDING,                           ///< Property, name "icon-padding",    type Vector4
+      UNSELECTED_ICON = PROPERTY_START_INDEX, ///< Property, name "unselectedIcon",  type std::string
+      SELECTED_ICON,                          ///< Property, name "selectedIcon",    type std::string
+      ICON_ALIGNMENT,                         ///< Property, name "iconAlignment",   type std::string
+      LABEL_PADDING,                          ///< Property, name "labelPadding",    type Vector4
+      ICON_PADDING,                           ///< Property, name "iconPadding",     type Vector4
     };
   };
 
@@ -122,7 +126,10 @@ public:
   using Button::SetButtonImage;
 
   /**
-   * @deprecated Sets the unselected image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the unselected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetButtonImage( Actor image );
@@ -130,7 +137,10 @@ public:
   using Button::SetBackgroundImage;
 
   /**
-   * @deprecated Sets the background image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetBackgroundImage( Actor image );
@@ -138,7 +148,10 @@ public:
   using Button::SetSelectedImage;
 
   /**
-   * @deprecated Sets the selected image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the selected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetSelectedImage( Actor image );
@@ -146,7 +159,10 @@ public:
   using Button::SetSelectedBackgroundImage;
 
   /**
-   * @deprecated Sets the selected background image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the selected background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetSelectedBackgroundImage( Actor image );
@@ -154,7 +170,10 @@ public:
   using Button::SetDisabledBackgroundImage;
 
   /**
-   * @deprecated Sets the disabled background image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the disabled background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledBackgroundImage( Actor image );
@@ -162,7 +181,10 @@ public:
   using Button::SetDisabledImage;
 
   /**
-   * @deprecated Sets the disabled image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the disabled image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledImage( Actor image );
@@ -170,7 +192,10 @@ public:
   using Button::SetDisabledSelectedImage;
 
   /**
-   * @deprecated Sets the disabled selected image with an Actor.
+   * @deprecated DALi 1.0.50
+   *
+   * @brief Sets the disabled selected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledSelectedImage( Actor image );
@@ -193,6 +218,9 @@ public: // Not intended for application developers
   DALI_INTERNAL PushButton( Dali::Internal::CustomActor* internal );
 };
 
+/**
+ * @}
+ */
 } // namespace Toolkit
 
 } // namespace Dali