X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fslider%2Fslider.h;h=6981a69b0a77695b024b8cbaa34132308b0ed6de;hb=46516d3e1711bd272cc00002876cf207465fa8ce;hp=1a382bde551e169966510be0ff9f04e82d8214f4;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index 1a382bd..6981a69 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SLIDER_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. @@ -34,43 +34,55 @@ class Slider; /** * @brief Slider is a control to enable sliding an indicator between two values + * + * Signals + * | %Signal Name | Method | + * |-------------------|-----------------------------| + * | value-changed | @ref ValueChangedSignal() | + * | mark | @ref MarkSignal() | */ class DALI_IMPORT_API Slider : public Control { public: - //Signal Names - static const char* const SIGNAL_VALUE_CHANGED; - static const char* const SIGNAL_MARK; - - // Properties - static const Property::Index LOWER_BOUND_PROPERTY; ///< Property, name "lower-bound", type FLOAT - static const Property::Index UPPER_BOUND_PROPERTY; ///< Property, name "upper-bound", type FLOAT - static const Property::Index VALUE_PROPERTY; ///< Property, name "value", type FLOAT - - static const Property::Index HIT_REGION_PROPERTY; ///< Property, name "hit-region", type VECTOR2 - static const Property::Index BACKING_REGION_PROPERTY; ///< Property, name "backing-region", type VECTOR2 - static const Property::Index HANDLE_REGION_PROPERTY; ///< Property, name "handle-region", type VECTOR2 - - static const Property::Index BACKING_IMAGE_NAME_PROPERTY; ///< Property, name "backing-image-name", type STRING - static const Property::Index HANDLE_IMAGE_NAME_PROPERTY; ///< Property, name "handle-image-name", type STRING - static const Property::Index PROGRESS_IMAGE_NAME_PROPERTY; ///< Property, name "progress-image-name", type STRING - static const Property::Index POPUP_IMAGE_NAME_PROPERTY; ///< Property, name "popup-image-name", type STRING - static const Property::Index POPUP_ARROW_IMAGE_NAME_PROPERTY; ///< Property, name "popup-arrow-image-name", type STRING - - static const Property::Index DISABLE_COLOR_PROPERTY; ///< Property, name "disable-color", type VECTOR4 - static const Property::Index POPUP_TEXT_COLOR_PROPERTY; ///< Property, name "popup-text-color", type VECTOR4 - - static const Property::Index VALUE_PRECISION_PROPERTY; ///< Property, name "value-precision", type INT - - static const Property::Index SHOW_POPUP_PROPERTY; ///< Property, name "show-popup", type BOOLEAN - static const Property::Index SHOW_VALUE_PROPERTY; ///< Property, name "show-value", type BOOLEAN - - static const Property::Index ENABLED_PROPERTY; ///< Property, name "enabled", type BOOLEAN + /** + * @brief The start and end property ranges for this control. + */ + enum PropertyRange + { + PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, + PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices + }; - static const Property::Index MARKS_PROPERTY; ///< Property, name "marks", type Property::Array - static const Property::Index SNAP_TO_MARKS_PROPERTY; ///< Property, name "snap-to-marks", type BOOLEAN - static const Property::Index MARK_TOLERANCE_PROPERTY; ///< Property, name "mark-tolerance", type FLOAT + /** + * @brief An enumeration of properties belonging to the Slider class. + */ + struct Property + { + enum + { + LOWER_BOUND = PROPERTY_START_INDEX, ///< Property, name "lower-bound", type float + UPPER_BOUND, ///< Property, name "upper-bound", type float + VALUE, ///< Property, name "value", type float + HIT_REGION, ///< Property, name "hit-region", type Vector2 + BACKING_REGION, ///< Property, name "backing-region", type Vector2 + HANDLE_REGION, ///< Property, name "handle-region", type Vector2 + BACKING_IMAGE_NAME, ///< Property, name "backing-image-name", type std::string + HANDLE_IMAGE_NAME, ///< Property, name "handle-image-name", type std::string + PROGRESS_IMAGE_NAME, ///< Property, name "progress-image-name", type std::string + POPUP_IMAGE_NAME, ///< Property, name "popup-image-name", type std::string + POPUP_ARROW_IMAGE_NAME, ///< Property, name "popup-arrow-image-name", type std::string + DISABLE_COLOR, ///< Property, name "disable-color", type Vector4 + POPUP_TEXT_COLOR, ///< Property, name "popup-text-color", type Vector4 + VALUE_PRECISION, ///< Property, name "value-precision", type int + SHOW_POPUP, ///< Property, name "show-popup", type bool + SHOW_VALUE, ///< Property, name "show-value", type bool + ENABLED, ///< Property, name "enabled", type bool + MARKS, ///< Property, name "marks", type Property::Array + SNAP_TO_MARKS, ///< Property, name "snap-to-marks", type bool + MARK_TOLERANCE, ///< Property, name "mark-tolerance", type float + }; + }; public: