projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year to 2015 for public api: toolkit
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
check-box-button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
index
e6b2a5e
..
de1c2b0
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/check-box-button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/check-box-button.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,6
+22,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/buttons/check-box-button-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/buttons/check-box-button-impl.h>
+#include <dali/public-api/actors/image-actor.h>
namespace Dali
{
namespace Dali
{
@@
-29,8
+30,6
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-const char* const CheckBoxButton::ACTION_CHECK_BOX_BUTTON_CLICK = "check-box-button-click";
-
CheckBoxButton::CheckBoxButton()
: Button()
{
CheckBoxButton::CheckBoxButton()
: Button()
{
@@
-64,19
+63,9
@@
CheckBoxButton CheckBoxButton::DownCast( BaseHandle handle )
return Control::DownCast<CheckBoxButton, Internal::CheckBoxButton>(handle);
}
return Control::DownCast<CheckBoxButton, Internal::CheckBoxButton>(handle);
}
-void CheckBoxButton::SetChecked( bool checked )
-{
- Dali::Toolkit::GetImplementation( *this ).SetChecked( checked );
-}
-
-bool CheckBoxButton::IsChecked() const
-{
- return Dali::Toolkit::GetImplementation( *this ).IsChecked();
-}
-
void CheckBoxButton::SetBackgroundImage( Image image )
{
void CheckBoxButton::SetBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetBackgroundImage( Actor image )
}
void CheckBoxButton::SetBackgroundImage( Actor image )
@@
-89,25
+78,24
@@
Actor CheckBoxButton::GetBackgroundImage() const
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
-void CheckBoxButton::Set
Check
edImage( Image image )
+void CheckBoxButton::Set
Select
edImage( Image image )
{
{
- Dali::Toolkit::GetImplementation( *this ).Set
CheckedImage( image
);
+ Dali::Toolkit::GetImplementation( *this ).Set
SelectedImage( ImageActor::New( image )
);
}
}
-void CheckBoxButton::Set
Check
edImage( Actor image )
+void CheckBoxButton::Set
Select
edImage( Actor image )
{
{
- Dali::Toolkit::GetImplementation( *this ).Set
Check
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).Set
Select
edImage( image );
}
}
-
-Actor CheckBoxButton::GetCheckedImage() const
+Actor CheckBoxButton::GetSelectedImage() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).Get
Check
edImage();
+ return Dali::Toolkit::GetImplementation( *this ).Get
Select
edImage();
}
void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
}
void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage(
image
);
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage(
ImageActor::New( image )
);
}
void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
}
void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
@@
-120,19
+108,19
@@
Actor CheckBoxButton::GetDisabledBackgroundImage() const
return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
-void CheckBoxButton::SetDisabled
Check
edImage( Image image )
+void CheckBoxButton::SetDisabled
Select
edImage( Image image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDisabled
CheckedImage( image
);
+ Dali::Toolkit::GetImplementation( *this ).SetDisabled
SelectedImage( ImageActor::New( image )
);
}
}
-void CheckBoxButton::SetDisabled
Check
edImage( Actor image )
+void CheckBoxButton::SetDisabled
Select
edImage( Actor image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDisabled
Check
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabled
Select
edImage( image );
}
}
-Actor CheckBoxButton::GetDisabled
Check
edImage() const
+Actor CheckBoxButton::GetDisabled
Select
edImage() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).GetDisabled
Check
edImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDisabled
Select
edImage();
}
CheckBoxButton::CheckBoxButton( Internal::CheckBoxButton& implementation )
}
CheckBoxButton::CheckBoxButton( Internal::CheckBoxButton& implementation )