X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fbutton.cpp;h=2dd17c30c005978731c47520493475428a788dae;hp=56cd667cff22285f89a1ed37dbac1c86f532ec4b;hb=863244a09761c6e22a224299b6155a285e21d6ec;hpb=6084b902e588a8ed1b8ec0dd7aacae8775006ef6

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index 56cd667..2dd17c3 100644
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -16,13 +16,17 @@
  */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/public-api/images/resource-image.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/buttons/button-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 namespace Dali
 {
@@ -58,116 +62,162 @@ Button Button::DownCast( BaseHandle handle )
 
 void Button::SetDisabled( bool disabled )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabled() is deprecated and will be removed from next release. Use SetProperty DISABLED or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetDisabled( disabled );
 }
 
 bool Button::IsDisabled() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: IsDisabled() is deprecated and will be removed from next release. Use GetProperty DISABLED instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).IsDisabled();
 }
 
 void Button::SetAutoRepeating( bool autoRepeating )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetAutoRepeating() is deprecated and will be removed from next release. Use SetProperty AUTO_REPEATING or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetAutoRepeating( autoRepeating );
 }
 
 bool Button::IsAutoRepeating() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: IsAutoRepeating() is deprecated and will be removed from next release. Use GetProperty AUTO_REPEATING instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).IsAutoRepeating();
 }
 
 void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetInitialAutoRepeatingDelay() is deprecated and will be removed from next release. Use SetProperty INITIAL_AUTO_REPEATING_DELAY or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetInitialAutoRepeatingDelay( initialAutoRepeatingDelay );
 }
 
 float Button::GetInitialAutoRepeatingDelay() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetPositionInheritanceMode() is deprecated and will be removed from next release. Use GetProperty INITIAL_AUTO_REPEATING_DELAY or Styling file instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetInitialAutoRepeatingDelay();
 }
 
 void Button::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetNextAutoRepeatingDelay() is deprecated and will be removed from next release. Use SetProperty NEXT_AUTO_REPEATING_DELAY or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetNextAutoRepeatingDelay( nextAutoRepeatingDelay );
 }
 
 float Button::GetNextAutoRepeatingDelay() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetNextAutoRepeatingDelay() is deprecated and will be removed from next release. Use GetProperty NEXT_AUTO_REPEATING_DELAY instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetNextAutoRepeatingDelay();
 }
 
 void Button::SetTogglableButton( bool togglable )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetTogglableButton() is deprecated and will be removed from next release. Use SetProperty TOGGLABLE or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetTogglableButton( togglable );
 }
 
 bool Button::IsTogglableButton() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: IsTogglableButton() is deprecated and will be removed from next release. Use GetProperty TOGGLABLE instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).IsTogglableButton();
 }
 
 void Button::SetSelected( bool selected )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelected() is deprecated and will be removed from next release. Use SetProperty SELECTED instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetSelected( selected );
 }
 
 bool Button::IsSelected() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: IsSelected() is deprecated and will be removed from next release. Use GetProperty SELECTED instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).IsSelected();
 }
 
 void Button::SetAnimationTime( float animationTime )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetAnimationTime() is deprecated and will be removed from next release. Use Styling file to set animation instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetAnimationTime( animationTime );
 }
 
 float Button::GetAnimationTime() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetAnimationTime() is deprecated and will be removed from next release.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
 }
 
 void Button::SetLabelText( const std::string& label )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetLabelText() is deprecated and will be removed from next release. Use SetProperty LABEL or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetLabelText( label );
 }
 
 std::string Button::GetLabelText() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetLabelText() is deprecated and will be removed from next release. Use GetProperty LABEL instead.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetLabelText();
 }
 
 void Button::SetUnselectedImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetUnselectedImage() is deprecated and will be removed from next release. Use SetProperty UNSELECTED_STATE_IMAGE or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetUnselectedImage( filename );
 }
 
 void Button::SetBackgroundImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( filename );
 }
 
 void Button::SetSelectedImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedImage() is deprecated and will be removed from next release. Use SetProperty SELECTED_STATE_IMAGE or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( filename );
 }
 
 void Button::SetSelectedBackgroundImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedBackgroundImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( filename );
 }
 
 void Button::SetDisabledBackgroundImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledBackgroundImage() is deprecated and will be removed from next release. Use SetProperty DISABLED_STATE_IMAGE or Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( filename );
 }
 
 void Button::SetDisabledImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( filename );
 }
 
 void Button::SetDisabledSelectedImage( const std::string& filename )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledSelectedImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( filename );
 }
 
@@ -195,34 +245,39 @@ Button::ButtonSignalType& Button::StateChangedSignal()
 
 void Button::SetLabel( Actor label )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetLabel() is deprecated and will be removed from next release. Use SetProperty LABEL instead.\n" );
+
   Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
 }
 
 void Button::SetButtonImage( Image image )
 {
-  Actor imageActor = Toolkit::ImageView::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetButtonImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
+  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );
 }
 
 void Button::SetSelectedImage( Image image )
 {
-  Actor imageActor = Toolkit::ImageView::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
+
+  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
 }
 
 Actor Button::GetButtonImage() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetButtonImage() is deprecated and will be removed from next release.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
 }
 
 Actor Button::GetSelectedImage() const
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetSelectedImage() is deprecated and will be removed from next release.\n" );
+
   return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
 }
 
-
 Button::Button( Internal::Button& implementation )
 : Control( implementation )
 {