Added new property API to Button. Added Icon and color features. Deprecated old API

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / buttons / button.cpp

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index c7b7b89..f472375 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -128,64 +128,49 @@ float Button::GetAnimationTime() const
   return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
 }
 

-void Button::SetLabel( const std::string& label )
+void Button::SetLabelText( const std::string& label )

 {
 {

-  Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
-}
-
-void Button::SetLabel( Actor label )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
+  Dali::Toolkit::GetImplementation( *this ).SetLabelText( label );

 }
 
 }
 

-Actor Button::GetLabel() const
+std::string Button::GetLabelText() const

 {
 {

-  return Dali::Toolkit::GetImplementation( *this ).GetLabel();
+  return Dali::Toolkit::GetImplementation( *this ).GetLabelText();

 }
 
 }
 

-void Button::SetButtonImage( Image image )
+void Button::SetUnselectedImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetUnselectedImage( filename );

 }
 
 }
 

-void Button::SetBackgroundImage( Image image )
+void Button::SetBackgroundImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( filename );

 }
 
 }
 

-void Button::SetSelectedImage( Image image )
+void Button::SetSelectedImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( filename );

 }
 
 }
 

-void Button::SetSelectedBackgroundImage( Image image )
+void Button::SetSelectedBackgroundImage( const std::string& filename )

 {
 {

-  Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( ImageActor::New( image ) );
+  Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( filename );

 }
 
 }
 

-void Button::SetDisabledBackgroundImage( Image image )
+void Button::SetDisabledBackgroundImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( filename );

 }
 
 }
 

-void Button::SetDisabledImage( Image image )
+void Button::SetDisabledImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( filename );

 }
 
 }
 

-void Button::SetDisabledSelectedImage( Image image )
+void Button::SetDisabledSelectedImage( const std::string& filename )

 {
 {

-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( imageActor );
+  Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( filename );

 }
 
 Button::ButtonSignalType& Button::PressedSignal()
 }
 
 Button::ButtonSignalType& Button::PressedSignal()


@@ -208,6 +193,38 @@ Button::ButtonSignalType& Button::StateChangedSignal()
   return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
 }
 

+// Deprecated API
+
+void Button::SetLabel( Actor label )
+{
+  Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
+}
+
+void Button::SetButtonImage( Image image )
+{
+  Actor imageActor = ImageActor::New( image );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
+}
+
+void Button::SetSelectedImage( Image image )
+{
+  Actor imageActor = ImageActor::New( image );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
+}
+
+Actor Button::GetButtonImage() const
+{
+  return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
+}
+
+Actor Button::GetSelectedImage() const
+{
+  return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
+}
+
+

 Button::Button( Internal::Button& implementation )
 : Control( implementation )
 {
 Button::Button( Internal::Button& implementation )
 : Control( implementation )
 {