X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fbutton.h;h=f5c2701a35429cbeae7aa4b90ce2dcb223b7ae37;hb=018b3b5ba7512694a9b95494493f2ae0477f2746;hp=a3d0ca2fa8d7b4f44840b54232614d8b5de1ac7c;hpb=eea53605c5acb244aebb72d75bdd9b3a68a9678a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git
diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h
index a3d0ca2..f5c2701 100644
--- a/dali-toolkit/public-api/controls/buttons/button.h
+++ b/dali-toolkit/public-api/controls/buttons/button.h
@@ -2,7 +2,7 @@
#define __DALI_TOOLKIT_BUTTON_H__
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -31,17 +31,43 @@ namespace Internal DALI_INTERNAL
{
class Button;
}
+/**
+ * @addtogroup dali-toolkit-controls-buttons
+ * @{
+ */
/**
* @brief Button is a base class for different kind of buttons.
*
* This class provides the disabled property and the clicked signal.
*
- * A ClickedSignal() is emitted when the button is touched and the touch
- * point doesn't leave the boundary of the button.
+ * A ClickedSignal() is emitted when the button is touched and the touch point doesn't leave the boundary of the button.
*
* When the \e disabled property is set to \e true, no signal is emitted.
*
+ * Button provides the following properties which modify the signals emitted:
+ *
+ * - \e autorepeating
+ * When \e autorepeating is set to \e true, a Button::PressedSignal(), Button::ReleasedSignal() and Button::ClickedSignal() signals are emitted at regular
+ * intervals while the button is touched.
+ * The intervals could be modified with the Button::SetInitialAutoRepeatingDelay and Button::SetNextAutoRepeatingDelay methods.
+ *
+ * A \e togglable button can't be \e autorepeating. If the \e autorepeating property is set to \e true, then the \e togglable property is set to
+ * false but no signal is emitted.
+ *
+ *
- \e togglable
+ * When \e togglable is set to \e true, a Button::StateChangedSignal() signal is emitted, with the selected state.
+ *
+ *
+ * The button's appearance can be modified by setting properties for the various image filenames.
+ *
+ * The \e background is always shown and doesn't change if the button is pressed or released. The \e button image is shown over the \e background image when the
+ * button is not pressed and is replaced by the \e selected image when the button is pressed. The text label is placed always on the top of all images.
+ *
+ * When the button is disabled, \e background, \e button and \e selected images are replaced by their \e disabled images.
+ *
+ * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e selected images.
+ *
* Signals
* | %Signal Name | Method |
* |-------------------|-----------------------------|
@@ -75,16 +101,21 @@ public:
{
enum
{
- DISABLED = PROPERTY_START_INDEX, ///< name "disabled", @see SetDisabled(), type BOOLEAN
- AUTO_REPEATING, ///< name "auto-repeating", @see SetAutoRepeating(), type BOOLEAN
- INITIAL_AUTO_REPEATING_DELAY, ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type FLOAT
- NEXT_AUTO_REPEATING_DELAY, ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type FLOAT
- TOGGLABLE, ///< name "togglable", @see SetTogglableButton(), type BOOLEAN
- SELECTED, ///< name "selected", @see SetSelected(), type BOOLEAN
- NORMAL_STATE_ACTOR, ///< name "normal-state-actor", @see SetButtonImage(), type MAP
- SELECTED_STATE_ACTOR, ///< name "selected-state-actor", @see SetSelectedImage(), type MAP
- DISABLED_STATE_ACTOR, ///< name "disabled-state-actor", @see SetDisabledImage(), type MAP
- LABEL_ACTOR, ///< name "label-actor", @see SetLabel(), type MAP
+ DISABLED = PROPERTY_START_INDEX, ///< name "disabled", @see SetDisabled(), type bool
+ AUTO_REPEATING, ///< name "auto-repeating", @see SetAutoRepeating(), type bool
+ INITIAL_AUTO_REPEATING_DELAY, ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type float
+ NEXT_AUTO_REPEATING_DELAY, ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type float
+ TOGGLABLE, ///< name "togglable", @see SetTogglableButton(), type bool
+ SELECTED, ///< name "selected", @see SetSelected(), type bool
+ UNSELECTED_STATE_IMAGE, ///< name "unselected-state-image", @see SetUnselectedImage(), type std::string
+ SELECTED_STATE_IMAGE, ///< name "selected-state-image", @see SetSelectedImage(), type std::string
+ DISABLED_STATE_IMAGE, ///< name "disabled-state-image", @see SetDisabledImage(), type std::string
+ UNSELECTED_COLOR, ///< name "unselected-color", type Vector4
+ SELECTED_COLOR, ///< name "selected-color", type Vector4
+ LABEL, ///< name "label", type Property::Map
+
+ // Deprecated properties:
+ LABEL_TEXT, ///< name "label-text", @see SetLabelText(), type std::string
};
};
@@ -218,7 +249,7 @@ public:
/**
* @brief Sets the animation time.
*
- * @param [in] animationTime The animation time in seconds.
+ * @param[in] animationTime The animation time in seconds.
*/
void SetAnimationTime( float animationTime );
@@ -230,23 +261,99 @@ public:
float GetAnimationTime() const;
/**
- * @brief Sets the button label.
+ * @brief Sets the button's label.
*
- * @param[in] label The button label.
+ * @param[in] label The label text.
*/
- void SetLabel( const std::string& label );
+ void SetLabelText( const std::string& label );
/**
- * @copydoc SetLabel( const std::string& label )
+ * @brief Gets the label.
+ *
+ * @return The label text.
*/
- void SetLabel( Actor label );
+ std::string GetLabelText() const;
/**
- * @brief Gets the label.
+ * @brief Sets the unselected button image.
+ *
+ * @param[in] filename The button image.
+ */
+ void SetUnselectedImage( const std::string& filename );
+
+ /**
+ * @brief Sets the background image.
+ *
+ * @param[in] filename The background image.
+ */
+ void SetBackgroundImage( const std::string& filename );
+
+ /**
+ * @brief Sets the selected image.
+ *
+ * @param[in] filename The selected image.
+ */
+ void SetSelectedImage( const std::string& filename );
+
+ /**
+ * @brief Sets the selected background image.
+ *
+ * @param[in] filename The selected background image.
+ */
+ void SetSelectedBackgroundImage( const std::string& filename );
+
+ /**
+ * @brief Sets the disabled background image.
+ *
+ * @param[in] filename The disabled background image.
+ */
+ void SetDisabledBackgroundImage( const std::string& filename );
+
+ /**
+ * @brief Sets the disabled button image.
+ *
+ * @param[in] filename The disabled button image.
+ */
+ void SetDisabledImage( const std::string& filename );
+
+ /**
+ * @brief Sets the disabled selected button image.
*
- * @return An actor with the label.
+ * @param[in] filename The disabled selected button image.
+ */
+ void SetDisabledSelectedImage( const std::string& filename );
+
+ // Deprecated API
+
+ /**
+ * @deprecated Sets the label with an actor.
+ * @param[in] label The actor to use as a label
+ */
+ void SetLabel( Actor label );
+
+ /**
+ * @deprecated Sets the button image.
+ * @param[in] image The button image.
+ */
+ void SetButtonImage( Image image );
+
+ /**
+ * @deprecated Sets the selected image.
+ * @param[in] image The selected image.
+ */
+ void SetSelectedImage( Image image );
+
+ /**
+ * @deprecated Gets the button image.
+ * @return An actor with the button image.
*/
- Actor GetLabel() const;
+ Actor GetButtonImage() const;
+
+ /**
+ * @deprecated Gets the selected image.
+ * @return An actor with the selected image.
+ */
+ Actor GetSelectedImage() const;
public: //Signals
@@ -317,6 +424,9 @@ public: // Not intended for application developers
DALI_INTERNAL Button( Dali::Internal::CustomActor* internal );
};
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali