X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-controls%2Ftext-label.h;h=fdb9ec7d11efc783fc58e0eb11dd3d3796cf0139;hp=8391682e2d94ace6dba8ff9f2e36374e1f5195d2;hb=0207e16930421216c5a22a0fd3ac409f3bd2a7b0;hpb=43304152ae02a473296e85846bf8c1b08bd918ac

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index 8391682..fdb9ec7 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
 
 namespace Dali
 {
@@ -42,15 +41,31 @@ class DALI_IMPORT_API TextLabel : public Control
 {
 public:
 
-  // Property indices
-  static const Property::Index PROPERTY_RENDERING_BACKEND; ///< name "rendering-backend", type UNSIGNED INT
-  static const Property::Index PROPERTY_TEXT;              ///< name "text", type STRING
-  static const Property::Index PROPERTY_MULTI_LINE;        ///< name "multi-line", 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              ///< Reserve property indices
+  };
 
-  // Property names
-  static const std::string RENDERING_BACKEND_PROPERTY_NAME; ///< Property, name "rendering-backend", type UNSIGNED INT
-  static const std::string TEXT_PROPERTY_NAME;              ///< Property, name "text", type STRING
-  static const std::string MULTI_LINE_PROPERTY_NAME;        ///< Property, name "multi-line", type BOOLEAN
+  /**
+   * @brief An enumeration of properties belonging to the TextLabel class.
+   */
+  struct Property
+  {
+    enum
+    {
+      RENDERING_BACKEND = PROPERTY_START_INDEX, ///< name "rendering-backend", The type or rendering e.g. bitmap-based,      type INT
+      TEXT,                                     ///< name "text",              The text to display in UTF-8 format,          type STRING
+      FONT_FAMILY,                              ///< name "font-family",       The requested font family,                    type STRING
+      FONT_STYLE,                               ///< name "font-style",        The requested font style e.g. Regular/Italic, type STRING
+      POINT_SIZE,                               ///< name "point-size",        The size of font in points,                   type FLOAT
+      MULTI_LINE,                               ///< name "multi-line",        The single-line or multi-line layout option,  type BOOLEAN
+      ALIGNMENT,                                ///< name "alignment",         The line alignment,                           type STRING,  values "BEGIN", "CENTER", "END"
+    };
+  };
 
   /**
    * Create the TextLabel control.