X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fdefault-controls%2Fcheck-button-factory.cpp;h=5715e49e6c9ebe8762513af8fa268e2faf22333e;hb=3b16ae16f01bd50a26e6c44e6e20ebb8499b4f91;hp=cff908b5bd4f28940edd118b9cc03eb9c5fa22fe;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp index cff908b..5715e49 100644 --- a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp +++ b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp @@ -52,7 +52,7 @@ Alignment CreateAlignedImage( const std::string& imagePath ) } // namespace -CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& disabledBackgroundImagePath, const std::string& disabledCheckedImagePath ) +CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& selectedImagePath, const std::string& disabledBackgroundImagePath, const std::string& disabledSelectedImagePath ) { CheckBoxButton button = Toolkit::CheckBoxButton::New(); @@ -61,9 +61,9 @@ CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, con button.SetBackgroundImage( CreateAlignedImage( backgroundImagePath ) ); } - if( !checkedImagePath.empty() ) + if( !selectedImagePath.empty() ) { - button.SetCheckedImage( CreateAlignedImage( checkedImagePath ) ); + button.SetSelectedImage( CreateAlignedImage( selectedImagePath ) ); } if( !disabledBackgroundImagePath.empty() ) @@ -71,15 +71,15 @@ CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, con button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImagePath ) ); } - if( !disabledCheckedImagePath.empty() ) + if( !disabledSelectedImagePath.empty() ) { - button.SetDisabledCheckedImage( CreateAlignedImage( disabledCheckedImagePath ) ); + button.SetDisabledSelectedImage( CreateAlignedImage( disabledSelectedImagePath ) ); } return button; } -CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor disabledBackgroundImageActor, Actor disabledCheckedImagActor ) +CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor selectedImageActor, Actor disabledBackgroundImageActor, Actor disabledSelectedImagActor ) { CheckBoxButton button = Toolkit::CheckBoxButton::New(); @@ -88,9 +88,9 @@ CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedIm button.SetBackgroundImage( CreateAlignedImage( backgroundImageActor ) ); } - if( checkedImageActor ) + if( selectedImageActor ) { - button.SetCheckedImage( CreateAlignedImage( checkedImageActor ) ); + button.SetSelectedImage( CreateAlignedImage( selectedImageActor ) ); } if( disabledBackgroundImageActor ) @@ -98,15 +98,15 @@ CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedIm button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImageActor ) ); } - if( disabledCheckedImagActor ) + if( disabledSelectedImagActor ) { - button.SetDisabledCheckedImage( CreateAlignedImage( disabledCheckedImagActor ) ); + button.SetDisabledSelectedImage( CreateAlignedImage( disabledSelectedImagActor ) ); } return button; } -CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath ) +CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& selectedImagePath ) { CheckBoxButton button = Toolkit::CheckBoxButton::New(); @@ -115,15 +115,15 @@ CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, con button.SetBackgroundImage( CreateAlignedImage( backgroundImagePath ) ); } - if( !checkedImagePath.empty() ) + if( !selectedImagePath.empty() ) { - button.SetCheckedImage( CreateAlignedImage( checkedImagePath ) ); + button.SetSelectedImage( CreateAlignedImage( selectedImagePath ) ); } return button; } -CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor ) +CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor selectedImageActor ) { CheckBoxButton button = Toolkit::CheckBoxButton::New(); @@ -132,9 +132,9 @@ CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedIm button.SetBackgroundImage( CreateAlignedImage( backgroundImageActor ) ); } - if( checkedImageActor ) + if( selectedImageActor ) { - button.SetCheckedImage( CreateAlignedImage( checkedImageActor ) ); + button.SetSelectedImage( CreateAlignedImage( selectedImageActor ) ); } return button;