Merge base & optional

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / check-box-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index 500cc09..cb5e08c 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
 #define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
 
-//
-// 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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
@@ -101,46 +102,46 @@ public:
   Actor GetCheckedImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedBackgroundImage( Image image )
+   * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledBackgroundImage( Image image )
    */
-  void SetDimmedBackgroundImage( Image image );
+  void SetDisabledBackgroundImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedBackgroundImage( Actor image )
+   * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledBackgroundImage( Actor image )
    */
-  void SetDimmedBackgroundImage( Actor image );
+  void SetDisabledBackgroundImage( Actor image );
 
   /**
    * Used by the painter only.
-   * @return A reference to the dimmed background image.
+   * @return A reference to the disabled background image.
    */
-  Actor& GetDimmedBackgroundImage();
+  Actor& GetDisabledBackgroundImage();
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::GetDimmedBackgroundImage()
+   * @copydoc Dali::Toolkit::CheckBoxButton::GetDisabledBackgroundImage()
    */
-  Actor GetDimmedBackgroundImage() const;
+  Actor GetDisabledBackgroundImage() const;
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedCheckedImage( Image image )
+   * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledCheckedImage( Image image )
    */
-  void SetDimmedCheckedImage( Image image );
+  void SetDisabledCheckedImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedCheckedImage( Actor image )
+   * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledCheckedImage( Actor image )
    */
-  void SetDimmedCheckedImage( Actor image );
+  void SetDisabledCheckedImage( Actor image );
 
   /**
    * Used by the painter only.
-   * @return A reference to the dimmed checked image.
+   * @return A reference to the disabled checked image.
    */
-  Actor& GetDimmedCheckedImage();
+  Actor& GetDisabledCheckedImage();
 
   /**
-   * @copydoc Dali::Toolkit::CheckBoxButton::GetDimmedCheckedImage()
+   * @copydoc Dali::Toolkit::CheckBoxButton::GetDisabledCheckedImage()
    */
-  Actor GetDimmedCheckedImage() const;
+  Actor GetDisabledCheckedImage() const;
 
   /**
    * Used by the painter only.
@@ -154,7 +155,7 @@ public:
    */
   Actor& GetFadeOutCheckedImage();
 
-protected: // From ControlImpl
+protected: // From Control
 
   /**
    * Respond the activate notification.
@@ -177,7 +178,7 @@ public:
    * @param[in] attributes The attributes with which to perfrom this action.
    * @return true if action has been accepted by this control
    */
-  static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
+  static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes);
 
 protected: // From Button
 
@@ -230,17 +231,13 @@ private:
 
   Actor mBackgroundImage;         ///< Stores the background image.
   Actor mCheckedImage;            ///< Stores the checked image.
-  Actor mDimmedCheckedImage;      ///< Stores the dimmed checked image.
-  Actor mDimmedBackgroundImage;   ///< Stores the dimmed background image.
+  Actor mDisabledCheckedImage;    ///< Stores the disabled checked image.
+  Actor mDisabledBackgroundImage; ///< Stores the disabled background image.
   Actor mFadeOutBackgroundImage;  ///< Stores a background image, which is in a fade out animation, to be removed when the animation finishes.
   Actor mFadeOutCheckedImage;     ///< Stores a foreground image, which is in a fade out animation, to be removed when the animation finishes.
 
   // Actions
   bool mClickActionPerforming;
-
-  // Properties
-  Property::Index mUseFadeAnimationProperty;
-  Property::Index mUseCheckAnimationProperty;
 };
 
 } // namespace Internal