X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.h;h=6417b4b0247f7b8048f19b1ee03892cda416dc4f;hb=0e07671d24b10bd49423ec6ce22817000bb18336;hp=f1925a3c40fbfc6ccc13a247ccbb246f90206ec3;hpb=bc96db3d2013dbc71df9bb97ec14159c1afddb31;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h
index f1925a3..6417b4b 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -93,130 +93,58 @@ public:
    */
   static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex );
 
-private: // From Button
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
-   */
-  virtual void OnButtonInitialize();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnLabelSet()
-   */
-  virtual void OnLabelSet();
-
   /**
-   * @copydoc Toolkit::Internal::Button::OnButtonImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnButtonImageSet();
+  void SetButtonImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnSelectedImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnSelectedImageSet();
+  void SetBackgroundImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnBackgroundImage()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnBackgroundImageSet();
+  void SetSelectedImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnSelectedBackgroundImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnSelectedBackgroundImageSet();
+  void SetSelectedBackgroundImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnDisabledImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnDisabledImageSet();
+  void SetDisabledBackgroundImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnDisabledSelectedImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnDisabledSelectedImageSet();
+  void SetDisabledImage( Actor image );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnDisabledBackgroundImageSet()
+   * Deprecated API for Setting Pushbutton image using an Actor
+   * @param[in] image, Image Actor that has a url which can be used to create an image visual
    */
-  virtual void OnDisabledBackgroundImageSet();
+  void SetDisabledSelectedImage( Actor image );
 
-  /**
-   * @copydoc Toolkit::Internal::Button::PrepareForTranstionIn( Actor actor )
-   */
-  virtual void PrepareForTranstionIn( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::PrepareForTranstionOut( Actor actor )
-   */
-  virtual void PrepareForTranstionOut( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnTransitionIn( Actor actor )
-   */
-  virtual void OnTransitionIn( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnTransitionOut( Actor actor )
-   */
-  virtual void OnTransitionOut( Actor actor );
-
-private: // From Control
-
-  /**
-   * @copydoc CustomActorImpl::OnSizeSet( const Vector3& targetSize )
-   */
-  virtual void OnSizeSet( const Vector3& targetSize );
-
-  /**
-   * @copydoc Toolkit::Control::GetNaturalSize
-   */
-  virtual Vector3 GetNaturalSize();
+private: // From Button
 
   /**
-   * @copydoc Toolkit::Control::OnSetResizePolicy
+   * @copydoc Toolkit::Internal::Button::OnInitialize
    */
-  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension );
+  virtual void OnInitialize();
 
 private:
 
   /**
-   * It adds the actor to the root actor and to the fade in animation.
-   * @param[inout] actor The actor.
-   * @param[in] opacity The opacity to fade to
-   */
-  void FadeImageTo( Actor actor, float opacity );
-
-  /**
-   * @brief Custom configuration for size negotiation
-   */
-  void ConfigureSizeNegotiation();
-
-  /**
-   * @brief Configure size negotiation for a given dimension
-   *
-   * @param[in] dimension The dimension to configure
-   * @param[in] images The list of images to configure
-   * @param[in] label The text label to configure
-   */
-  void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label );
-
-  /**
-   * @brief Sets either the selected or unselected icon.
-   *
-   * @param[in] state The icon state to set
-   * @param[in] iconFilename The filename of the icon
-   */
-  void SetIcon( DecorationState state, const std::string iconFilename );
-
-  /**
-   * @brief Gets either the selected or unselected icon.
-   *
-   * @param[in] state The icon state to get
-   * @return    The filename of the icon
-   */
-  std::string& GetIcon( DecorationState state );
-
-  /**
    * @brief Sets the alignment mode to use to align the icon to the label.
    *
    * @param[in] iconAlignment The alignment mode to use
@@ -230,34 +158,6 @@ private:
    */
   const PushButton::IconAlignment GetIconAlignment() const;
 
-  /**
-   * @brief Sets the padding for the label.
-   *
-   * @param[in] padding The padding to set
-   */
-  void SetLabelPadding( const Vector4& padding );
-
-  /**
-   * @brief Gets the padding for the label.
-   *
-   * @return The label padding
-   */
-  Vector4 GetLabelPadding();
-
-  /**
-   * @brief Sets the padding for the icon.
-   *
-   * @param[in] padding The padding to set
-   */
-  void SetIconPadding( const Vector4& padding );
-
-  /**
-   * @brief Gets the padding for the icon.
-   *
-   * @return The icon padding
-   */
-  Vector4 GetIconPadding();
-
 private:
 
   // Undefined
@@ -268,11 +168,7 @@ private:
 
 private:
 
-  std::string    mIconName[ DECORATION_STATES ]; ///< The original filenames for the icons.
-  Padding        mLabelPadding;                  ///< The padding around the label (if present).
-  Padding        mIconPadding;                   ///< The padding around the icon (if present).
   IconAlignment  mIconAlignment;                 ///< The alignment of the icon against the label.
-  Vector3        mSize;                          ///< The button's size.
 };
 
 } // namespace Internal