X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.cpp;h=c15c15e08e9be4134254df6ac0f12f9eb00f0738;hp=f5093a80653702d9651758ef1695bc1a708e226a;hb=88eec954ad7b59851b423be3b82a4af569f892dd;hpb=680c5587a1478717393d3a03cf6a17801edd00e0

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index f5093a8..c15c15e 100644
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -75,7 +75,7 @@ Dali::Toolkit::CheckBoxButton CheckBoxButton::New()
 
 void CheckBoxButton::SetChecked( bool checked )
 {
-  if( !mDimmed && ( checked != mChecked ) )
+  if( !mDisabled && ( checked != mChecked ) )
   {
     // Stores the state.
     mChecked = checked;
@@ -85,8 +85,8 @@ void CheckBoxButton::SetChecked( bool checked )
     // Notifies the painter the checkbox has been checked.
     GetCheckBoxButtonPainter( mPainter )->Checked( handle );
 
-    // Raise toggled signal
-    mToggledSignalV2.Emit( handle, mChecked );
+    // Raise state changed signal
+    mStateChangedSignal.Emit( handle, mChecked );
   }
 }
 
@@ -137,46 +137,46 @@ Actor CheckBoxButton::GetCheckedImage() const
   return mCheckedImage;
 }
 
-void CheckBoxButton::SetDimmedBackgroundImage( Image image )
+void CheckBoxButton::SetDisabledBackgroundImage( Image image )
 {
-  SetDimmedBackgroundImage( ImageActor::New( image ) );
+  SetDisabledBackgroundImage( ImageActor::New( image ) );
 }
 
-void CheckBoxButton::SetDimmedBackgroundImage( Actor image )
+void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
 {
   Toolkit::CheckBoxButton handle( GetOwner() );
-  GetCheckBoxButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image );
+  GetCheckBoxButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image );
 }
 
-Actor& CheckBoxButton::GetDimmedBackgroundImage()
+Actor& CheckBoxButton::GetDisabledBackgroundImage()
 {
-  return mDimmedBackgroundImage;
+  return mDisabledBackgroundImage;
 }
 
-Actor CheckBoxButton::GetDimmedBackgroundImage() const
+Actor CheckBoxButton::GetDisabledBackgroundImage() const
 {
-  return mDimmedBackgroundImage;
+  return mDisabledBackgroundImage;
 }
 
-void CheckBoxButton::SetDimmedCheckedImage( Image image )
+void CheckBoxButton::SetDisabledCheckedImage( Image image )
 {
-  SetDimmedCheckedImage( ImageActor::New( image ) );
+  SetDisabledCheckedImage( ImageActor::New( image ) );
 }
 
-void CheckBoxButton::SetDimmedCheckedImage( Actor image )
+void CheckBoxButton::SetDisabledCheckedImage( Actor image )
 {
   Toolkit::CheckBoxButton handle( GetOwner() );
-  GetCheckBoxButtonPainter( mPainter )->SetDimmedCheckedImage( handle, image );
+  GetCheckBoxButtonPainter( mPainter )->SetDisabledCheckedImage( handle, image );
 }
 
-Actor& CheckBoxButton::GetDimmedCheckedImage()
+Actor& CheckBoxButton::GetDisabledCheckedImage()
 {
-  return mDimmedCheckedImage;
+  return mDisabledCheckedImage;
 }
 
-Actor CheckBoxButton::GetDimmedCheckedImage() const
+Actor CheckBoxButton::GetDisabledCheckedImage() const
 {
-  return mDimmedCheckedImage;
+  return mDisabledCheckedImage;
 }
 
 Actor& CheckBoxButton::GetFadeOutBackgroundImage()
@@ -191,8 +191,6 @@ Actor& CheckBoxButton::GetFadeOutCheckedImage()
 
 void CheckBoxButton::OnButtonInitialize()
 {
-  mUseFadeAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME, false );
-  mUseCheckAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_CHECK_ANIMATION_PROPERTY_NAME, true );
 }
 
 void CheckBoxButton::OnButtonUp()
@@ -217,7 +215,7 @@ float CheckBoxButton::OnAnimationTimeRequested() const
 void CheckBoxButton::OnActivated()
 {
   // When the button is activated, it performs the click action
-  std::vector<Property::Value> attributes;
+  PropertyValueContainer attributes;
   DoClickAction(attributes);
 }
 
@@ -233,7 +231,7 @@ void CheckBoxButton::DoClickAction(const PropertyValueContainer& attributes)
   }
 }
 
-bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes)
 {
   bool ret = false;