Button refactoring: rename properties

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / buttons / push-button-impl.h

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
index d8a17e4..1297fef 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -143,88 +143,88 @@ public:
   Actor GetBackgroundImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetPressedImage( const Image image )
+   * @copydoc Dali::Toolkit::PushButton::SetSelectedImage( const Image image )
    */
-  void SetPressedImage( Image image );
+  void SetSelectedImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetPressedImage( Actor image )
+   * @copydoc Dali::Toolkit::PushButton::SetSelectedImage( Actor image )
    */
-  void SetPressedImage( Actor image );
+  void SetSelectedImage( Actor image );
 
   /**
    * Used by the painter only.
-   * @return A reference to the pressed image.
+   * @return A reference to the selected image.
    */
-  Actor& GetPressedImage();
+  Actor& GetSelectedImage();
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::GetPressedImage()
+   * @copydoc Dali::Toolkit::PushButton::GetSelectedImage()
    */
-  Actor GetPressedImage() const;
+  Actor GetSelectedImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetDimmedBackgroundImage( Image image )
+   * @copydoc Dali::Toolkit::PushButton::SetDisabledBackgroundImage( Image image )
    */
-  void SetDimmedBackgroundImage( Image image );
+  void SetDisabledBackgroundImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetDimmedBackgroundImage( Actor image )
+   * @copydoc Dali::Toolkit::PushButton::SetDisabledBackgroundImage( Actor image )
    */
-  void SetDimmedBackgroundImage( Actor image );
+  void SetDisabledBackgroundImage( Actor image );
 
   /**
    * Used by the painter only.
-   * @return A reference to the dimmed background image.
+   * @return A reference to the disabled background image.
    */
-  Actor& GetDimmedBackgroundImage();
+  Actor& GetDisabledBackgroundImage();
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::GetDimmedBackgroundImage()
+   * @copydoc Dali::Toolkit::PushButton::GetDisabledBackgroundImage()
    */
-  Actor GetDimmedBackgroundImage() const;
+  Actor GetDisabledBackgroundImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetDimmedImage( Image image )
+   * @copydoc Dali::Toolkit::PushButton::SetDisabledImage( Image image )
    */
-  void SetDimmedImage( Image image );
+  void SetDisabledImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetDimmedImage( Actor image )
+   * @copydoc Dali::Toolkit::PushButton::SetDisabledImage( Actor image )
    */
-  void SetDimmedImage( Actor image );
+  void SetDisabledImage( Actor image );
 
   /**
    * Used by the painter only.
-   * @return A reference to the dimmed button image.
+   * @return A reference to the disabled button image.
    */
-  Actor& GetDimmedImage();
+  Actor& GetDisabledImage();
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::GetDimmedImage()
+   * @copydoc Dali::Toolkit::PushButton::GetDisabledImage()
    */
-  Actor GetDimmedImage() const;
+  Actor GetDisabledImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetLabelText( const std::string& text )
+   * @copydoc Dali::Toolkit::PushButton::SetLabel( const std::string& label )
    */
-  void SetLabelText( const std::string& text );
+  void SetLabel( const std::string& label );
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::SetLabelText( Actor text )
+   * @copydoc Dali::Toolkit::PushButton::SetLabel( Actor label )
    */
-  void SetLabelText( Actor text );
+  void SetLabel( Actor label );
 
   /**
-   * Used by the painter only.
-   * @return A reference to the label actor.
+   * @copydoc Dali::Toolkit::PushButton::GetLabel()
    */
-  Actor& GetLabel();
+  Actor GetLabel() const;
 
   /**
-   * @copydoc Dali::Toolkit::PushButton::GetLabelText()
+   * Used by the painter only.
+   * @return A reference to the label actor.
    */
-  Actor GetLabelText() const;
+  Actor& GetLabel();
 
   /**
    * Used by the painter only.
@@ -398,11 +398,11 @@ private:
   Toolkit::PushButton::PressedSignalType mPressedSignal;   ///< Signal emitted when the button is pressed.
   Toolkit::PushButton::ReleasedSignalType mReleasedSignal; ///< Signal emitted when the button is released.
 
-  Actor mButtonImage;               ///< Stores the released image.
+  Actor mButtonImage;               ///< Stores the unselected image.
   Actor mBackgroundImage;           ///< Stores the background image.
-  Actor mPressedImage;              ///< Stores the pressed image.
-  Actor mDimmedImage;               ///< Stores the dimmed image.
-  Actor mDimmedBackgroundImage;     ///< Stores the dimmed background image.
+  Actor mSelectedImage;             ///< Stores the selected image.
+  Actor mDisabledImage;             ///< Stores the disabled image.
+  Actor mDisabledBackgroundImage;   ///< Stores the disabled background image.
 
   Actor mLabel;                     ///< Stores the text label.