From: Paul Wisbey
Date: Fri, 8 Jul 2016 10:31:11 +0000 (-0700)
Subject: Merge "Replaced Image with Texture in cube transition effect. All references to the...
X-Git-Tag: dali_1.1.43~21
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=764cd70c98c4f9393c8b50abb7b5a16484c28977;hp=47e2614d87c96f3144617e250eb1584a7b1b3755
Merge "Replaced Image with Texture in cube transition effect. All references to the Image type have been removed." into devel/master
---
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index a8aca48..07b810f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
@@ -147,3 +147,59 @@ int UtcDaliCheckBoxButtonSetGetSelected(void)
DALI_TEST_CHECK( gCheckBoxButtonState );
END_TEST;
}
+
+int UtcDaliCheckBoxSetLabelP(void)
+{
+ TestApplication application;
+
+ CheckBoxButton checkBox = CheckBoxButton::New();
+
+ Property::Map propertyMap;
+ propertyMap.Insert("text", "activate");
+ checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+
+ DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented
+
+ END_TEST;
+}
+
+int UtcDaliCheckBoxSetLabelDisabledP(void)
+{
+ TestApplication application;
+
+ CheckBoxButton checkBox = CheckBoxButton::New();
+ Stage::GetCurrent().Add( checkBox );
+
+ checkBox.SetSize( Vector2( 20.0f, 20.0f ) );
+ checkBox.SetDisabledBackgroundImage( "Image.jpg" );
+
+ application.SendNotification();
+ application.Render();
+
+ Property::Map propertyMap;
+ propertyMap.Insert("text", "activate");
+ checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
+
+ checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+
+ DALI_TEST_CHECK( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) );
+ DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented
+
+ END_TEST;
+}
+
+int UtcDaliCheckBoxSettingDisabled(void)
+{
+ ToolkitTestApplication application;
+
+ CheckBoxButton checkBox = CheckBoxButton::New();
+
+ checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
+ DALI_TEST_CHECK( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) );
+
+ checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), false);
+
+ DALI_TEST_CHECK( !checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) );
+
+ END_TEST;
+}
diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 30e84a9..dc00a3c 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -722,32 +722,6 @@ std::string Button::GetSelectedImageFilename() const
return std::string();
}
-std::string Button::GetBackgroundImageFilename() const
-{
- if( mBackgroundContent )
- {
- ResourceImage image = ResourceImage::DownCast( mBackgroundContent );
- if( image )
- {
- return image.GetUrl();
- }
- }
- return std::string();
-}
-
-std::string Button::GetSelectedBackgroundImageFilename() const
-{
- if( mSelectedBackgroundContent )
- {
- ResourceImage image = ResourceImage::DownCast( mSelectedBackgroundContent );
- if( image )
- {
- return image.GetUrl();
- }
- }
- return std::string();
-}
-
std::string Button::GetDisabledImageFilename() const
{
if( mDisabledContent )
@@ -761,32 +735,6 @@ std::string Button::GetDisabledImageFilename() const
return std::string();
}
-std::string Button::GetDisabledSelectedImageFilename() const
-{
- if( mDisabledSelectedContent )
- {
- ResourceImage image = ResourceImage::DownCast( mDisabledSelectedContent );
- if( image )
- {
- return image.GetUrl();
- }
- }
- return std::string();
-}
-
-std::string Button::GetDisabledBackgroundImageFilename() const
-{
- if( mDisabledBackgroundContent )
- {
- ResourceImage image = ResourceImage::DownCast( mDisabledBackgroundContent );
- if( image )
- {
- return image.GetUrl();
- }
- }
- return std::string();
-}
-
bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
{
bool ret = false;