-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// CLASS HEADER
-
#include "check-box-button-impl.h"
// EXTERNAL INCLUDES
-
#include <algorithm>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
// INTERNAL INCLUDES
-
#include "check-box-button-default-painter-impl.h"
namespace Dali
void CheckBoxButton::SetChecked( bool checked )
{
- if( !mDimmed && ( checked != mChecked ) )
+ if( !mDisabled && ( checked != mChecked ) )
{
// Stores the state.
mChecked = checked;
// Notifies the painter the checkbox has been checked.
GetCheckBoxButtonPainter( mPainter )->Checked( handle );
- // Emit signal.
- mClickedSignalV2.Emit( handle );
+ // Raise state changed signal
+ mStateChangedSignal.Emit( handle, mChecked );
}
}
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()
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()
void CheckBoxButton::OnActivated()
{
// When the button is activated, it performs the click action
- std::vector<Property::Value> attributes;
+ PropertyValueContainer attributes;
DoClickAction(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;