X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-editor-devel.h;h=3a8fa6f71e0fde541600469a2e8c614202b997e7;hp=3c4f28710849ae1fd3acc866c23898fb1b6b65f7;hb=2aab2479f7e6d127df4de063328570cc247ce6d4;hpb=f21b8178acf56da908c2ea5539210b683c13b975

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
index 3c4f287..3a8fa6f 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
@@ -74,89 +74,37 @@ namespace Property
       INPUT_EMBOSS = Dali::Toolkit::TextEditor::Property::INPUT_EMBOSS,
       OUTLINE = Dali::Toolkit::TextEditor::Property::OUTLINE,
       INPUT_OUTLINE = Dali::Toolkit::TextEditor::Property::INPUT_OUTLINE,
-
-      /**
-       * @brief name "smoothScroll", type bool
-       * @details Enable or disable the smooth scroll animation
-       */
-      SMOOTH_SCROLL = INPUT_OUTLINE + 1,
-
-      /**
-       * @brief name "smoothScrollDuration", type float
-       * @details Sets the duration of smooth scroll animation
-       */
-      SMOOTH_SCROLL_DURATION,
-
-      /**
-       * @brief name "enableScrollBar", type bool
-       * @details Enable or disable the scroll bar
-       */
-      ENABLE_SCROLL_BAR,
-
-      /**
-       * @brief name "scrollBarShowDuration", type float
-       * @details Sets the duration of scroll bar to show
-       */
-      SCROLL_BAR_SHOW_DURATION,
-
-      /**
-       * @brief name "scrollBarFadeDuration", type float
-       * @details Sets the duration of scroll bar to fade out
-       */
-      SCROLL_BAR_FADE_DURATION,
-
-      /**
-       * @brief The size of font in pixels.
-       *
-       * Conversion from Point size to Pixel size :
-       *  Pixel size = Point size * DPI / 72
-       * @details name "pixelSize", type float
-       */
-      PIXEL_SIZE,
-
-      /**
-       * @brief The line count of text.
-       * @details name "lineCount", type int
-       * @note this property is read-only.
-       */
-      LINE_COUNT,
+      SMOOTH_SCROLL = Dali::Toolkit::TextEditor::Property::SMOOTH_SCROLL,
+      SMOOTH_SCROLL_DURATION = Dali::Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION,
+      ENABLE_SCROLL_BAR = Dali::Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR,
+      SCROLL_BAR_SHOW_DURATION = Dali::Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION,
+      SCROLL_BAR_FADE_DURATION = Dali::Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION,
+      PIXEL_SIZE = Dali::Toolkit::TextEditor::Property::PIXEL_SIZE,
+      LINE_COUNT = Dali::Toolkit::TextEditor::Property::LINE_COUNT,
+      ENABLE_SELECTION = Dali::Toolkit::TextEditor::Property::ENABLE_SELECTION,
+      PLACEHOLDER = Dali::Toolkit::TextEditor::Property::PLACEHOLDER,
+      LINE_WRAP_MODE = Dali::Toolkit::TextEditor::Property::LINE_WRAP_MODE,
 
       /**
        * @brief The text to display when the TextEditor is empty and inactive.
-       * @details name "placeholderText", type string
+       * @details Name "placeholderText", type Property::STRING.
        */
       PLACEHOLDER_TEXT,
 
       /**
        * @brief The placeholder-text color.
-       * @details name "placeholderTextColor", type vector4
+       * @details Name "placeholderTextColor", type Property::VECTOR4.
        */
-      PLACEHOLDER_TEXT_COLOR
-  };
-} // namespace Property
+      PLACEHOLDER_TEXT_COLOR,
 
-namespace Scroll
-{
-  enum Type
-  {
-    STARTED,   ///< Scrolling is started.
-    FINISHED   ///< Scrolling is finished.
+      /**
+       * @brief Enables Text selection using Shift key.
+       * @details Name "enableShiftSelection", type Property::BOOLEAN.
+       */
+      ENABLE_SHIFT_SELECTION
   };
-} // namespace Scroll
 
-typedef Signal< void ( TextEditor, Scroll::Type ) > ScrollStateChangedSignalType;
-
-/**
- * @brief This signal is emitted when TextEditor scrolling is started or finished.
- *
- * A callback of the following type may be connected:
- * @code
- *   void YourCallbackName( ScrollState::Type type );
- * @endcode
- * type: Whether the scrolling is started or finished.
- * @return The signal to connect to
- */
-DALI_IMPORT_API ScrollStateChangedSignalType& ScrollStateChangedSignal( TextEditor textEditor );
+} // namespace Property
 
 } // namespace DevelTextEditor