X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Fpublic%2FBaseComponents%2FTextEditor.cs;h=e4fd298600de61a0974fef029f6cb4d395e3ec5c;hb=7210a4d9f09f13de444cabcdc69998744a9c19f0;hp=9f3e819d49ddb44e345cfeb77ba9138216d39476;hpb=2efd383257db631ea6f5570c0b093cbefb2473e1;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
index 9f3e819..e4fd298 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
@@ -1,31 +1,40 @@
-/** Copyright (c) 2017 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.
-*
-*/
+/*
+ * Copyright(c) 2017 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.
+ *
+ */
+
+extern alias TizenSystemSettings;
+using TizenSystemSettings.Tizen.System;
+
+using System;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.ComponentModel;
 
 namespace Tizen.NUI.BaseComponents
 {
-
-    using System;
-    using System.Runtime.InteropServices;
-
     /// <summary>
     /// A control which provides a multi-line editable text editor.
     /// </summary>
+    /// <since_tizen> 3 </since_tizen>
     public class TextEditor : View
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        private string textEditorTextSid = null;
+        private string textEditorPlaceHolderTextSid = null;
+        private bool systemlangTextFlag = false;
 
         internal TextEditor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextEditor_SWIGUpcast(cPtr), cMemoryOwn)
         {
@@ -40,6 +49,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Dispose.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         protected override void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -77,8 +87,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Event arguments that passed via TextChanged signal.
+        /// Event arguments that passed via the TextChanged signal.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public class TextChangedEventArgs : EventArgs
         {
             private TextEditor _textEditor;
@@ -86,6 +97,7 @@ namespace Tizen.NUI.BaseComponents
             /// <summary>
             /// TextEditor - is the texteditor control which has the text contents changed.
             /// </summary>
+            /// <since_tizen> 3 </since_tizen>
             public TextEditor TextEditor
             {
                 get
@@ -105,9 +117,10 @@ namespace Tizen.NUI.BaseComponents
         private TextChangedCallbackDelegate _textEditorTextChangedCallbackDelegate;
 
         /// <summary>
-        /// Event for TextChanged signal which can be used to subscribe/unsubscribe the event handler
-        /// provided by the user. TextChanged signal is emitted when the text changes.<br>
+        /// An event for the TextChanged signal which can be used to subscribe or unsubscribe the event handler
+        /// provided by the user. The TextChanged signal is emitted when the text changes.<br />
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public event EventHandler<TextChangedEventArgs> TextChanged
         {
             add
@@ -145,8 +158,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Event arguments that passed via ScrollStateChanged signal.
+        /// Event arguments that passed via the ScrollStateChanged signal.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public class ScrollStateChangedEventArgs : EventArgs
         {
             private TextEditor _textEditor;
@@ -155,6 +169,7 @@ namespace Tizen.NUI.BaseComponents
             /// <summary>
             /// TextEditor - is the texteditor control which has the scroll state changed.
             /// </summary>
+            /// <since_tizen> 3 </since_tizen>
             public TextEditor TextEditor
             {
                 get
@@ -170,6 +185,7 @@ namespace Tizen.NUI.BaseComponents
             /// <summary>
             /// ScrollState - is the texteditor control scroll state.
             /// </summary>
+            /// <since_tizen> 3 </since_tizen>
             public ScrollState ScrollState
             {
                 get
@@ -189,9 +205,10 @@ namespace Tizen.NUI.BaseComponents
         private ScrollStateChangedCallbackDelegate _textEditorScrollStateChangedCallbackDelegate;
 
         /// <summary>
-        /// Event for ScrollStateChanged signal which can be used to subscribe/unsubscribe the event handler
-        /// provided by the user. ScrollStateChanged signal is emitted when the scroll state changes.<br>
+        /// Event for the ScrollStateChanged signal which can be used to subscribe or unsubscribe the event handler
+        /// provided by the user. The ScrollStateChanged signal is emitted when the scroll state changes.<br />
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public event EventHandler<ScrollStateChangedEventArgs> ScrollStateChanged
         {
             add
@@ -231,7 +248,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        internal class Property
+        internal new class Property
         {
             internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get();
             internal static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get();
@@ -307,6 +324,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Creates the TextEditor control.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public TextEditor() : this(NDalicPINVOKE.TextEditor_New(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -317,7 +335,16 @@ namespace Tizen.NUI.BaseComponents
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        [Obsolete("Please do not use! this will be deprecated")]
+        /// <summary>
+        /// Downcasts a handle to textEditor handle.
+        /// </summary>
+        /// <param name="handle"></param>
+        /// <returns></returns>
+        /// <since_tizen> 3 </since_tizen>
+        /// Please do not use! this will be deprecated!
+        /// Instead please use as keyword.
+        [Obsolete("Please DO NOT use! This will be deprecated, instead please USE as keyword.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public new static TextEditor DownCast(BaseHandle handle)
         {
             TextEditor ret =  Registry.GetManagedBaseHandleFromNativePtr(handle) as TextEditor;
@@ -347,8 +374,87 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Text property.
+        /// The TranslatableText property.<br />
+        /// The text can set the SID value.<br />
+        /// </summary>
+        /// <exception cref='ArgumentNullException'>
+        /// ResourceManager about multilingual is null.
+        /// </exception>
+        /// <since_tizen> 4 </since_tizen>
+        public string TranslatableText
+        {
+            get
+            {
+                return textEditorTextSid;
+            }
+            set
+            {
+                if (NUIApplication.MultilingualResourceManager == null)
+                {
+                    throw new ArgumentNullException("ResourceManager about multilingual is null");
+                }
+                textEditorTextSid = value;
+                Text = SetTranslatable(textEditorTextSid);
+            }
+        }
+        /// <summary>
+        /// The TranslatablePlaceholderText property.<br />
+        /// The text can set the SID value.<br />
+        /// </summary>
+        /// <exception cref='ArgumentNullException'>
+        /// ResourceManager about multilingual is null.
+        /// </exception>
+        /// <since_tizen> 4 </since_tizen>
+        public string TranslatablePlaceholderText
+        {
+            get
+            {
+                return textEditorPlaceHolderTextSid;
+            }
+            set
+            {
+                if (NUIApplication.MultilingualResourceManager == null)
+                {
+                    throw new ArgumentNullException("ResourceManager about multilingual is null");
+                }
+                textEditorPlaceHolderTextSid = value;
+                PlaceholderText = SetTranslatable(textEditorPlaceHolderTextSid);
+            }
+        }
+        private string SetTranslatable(string textEditorSid)
+        {
+            string translatableText = null;
+            translatableText = NUIApplication.MultilingualResourceManager?.GetString(textEditorSid, new CultureInfo(SystemSettings.LocaleLanguage.Replace("_", "-")));
+            if (translatableText != null)
+            {
+                if (systemlangTextFlag == false)
+                {
+                    SystemSettings.LocaleLanguageChanged += new WeakEventHandler<LocaleLanguageChangedEventArgs>(SystemSettings_LocaleLanguageChanged).Handler;
+                    systemlangTextFlag = true;
+                }
+                return translatableText;
+            }
+            else
+            {
+                translatableText = "";
+                return translatableText;
+            }
+        }
+        private void SystemSettings_LocaleLanguageChanged(object sender, LocaleLanguageChangedEventArgs e)
+        {
+            if (textEditorTextSid != null)
+            {
+                Text = NUIApplication.MultilingualResourceManager?.GetString(textEditorTextSid, new CultureInfo(e.Value.Replace("_", "-")));
+            }
+            if (textEditorPlaceHolderTextSid != null)
+            {
+                PlaceholderText = NUIApplication.MultilingualResourceManager?.GetString(textEditorPlaceHolderTextSid, new CultureInfo(e.Value.Replace("_", "-")));
+            }
+        }
+        /// <summary>
+        /// The Text property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string Text
         {
             get
@@ -364,8 +470,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Text color property.
+        /// The TextColor property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Vector4 TextColor
         {
             get
@@ -381,8 +488,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Font family property.
+        /// The FontFamily property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string FontFamily
         {
             get
@@ -398,8 +506,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Font style property.
+        /// The FontStyle property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap FontStyle
         {
             get
@@ -415,8 +524,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Point size property.
+        /// The PointSize property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float PointSize
         {
             get
@@ -432,8 +542,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Horizontal alignment property.
+        /// The HorizontalAlignment property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public HorizontalAlignment HorizontalAlignment
         {
             get
@@ -487,8 +598,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Scroll threshold property.
+        /// The ScrollThreshold property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float ScrollThreshold
         {
             get
@@ -504,8 +616,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Scroll speed property.
+        /// The ScrollSpeed property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float ScrollSpeed
         {
             get
@@ -521,8 +634,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Primary cursor color property.
+        /// The PrimaryCursorColor property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Vector4 PrimaryCursorColor
         {
             get
@@ -538,8 +652,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SecondaryCursorColor property.
+        /// The SecondaryCursorColor property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Vector4 SecondaryCursorColor
         {
             get
@@ -555,8 +670,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// EnableCursorBlink property.
+        /// The EnableCursorBlink property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public bool EnableCursorBlink
         {
             get
@@ -572,8 +688,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// CursorBlinkInterval property.
+        /// The CursorBlinkInterval property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float CursorBlinkInterval
         {
             get
@@ -589,8 +706,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// CursorBlinkDuration property.
+        /// The CursorBlinkDuration property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float CursorBlinkDuration
         {
             get
@@ -606,8 +724,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// CursorWidth property.
+        /// The CursorWidth property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public int CursorWidth
         {
             get
@@ -623,8 +742,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// GrabHandleImage property.
+        /// The GrabHandleImage property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string GrabHandleImage
         {
             get
@@ -640,8 +760,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// GrabHandlePressedImage property.
+        /// The GrabHandlePressedImage property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string GrabHandlePressedImage
         {
             get
@@ -657,8 +778,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandleImageLeft property.
+        /// The SelectionHandleImageLeft property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandleImageLeft
         {
             get
@@ -674,8 +796,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandleImageRight property.
+        /// The SelectionHandleImageRight property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandleImageRight
         {
             get
@@ -691,8 +814,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandlePressedImageLeft property.
+        /// The SelectionHandlePressedImageLeft property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandlePressedImageLeft
         {
             get
@@ -708,8 +832,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandlePressedImageRight property.
+        /// The SelectionHandlePressedImageRight property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandlePressedImageRight
         {
             get
@@ -725,8 +850,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandleMarkerImageLeft property.
+        /// The SelectionHandleMarkerImageLeft property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandleMarkerImageLeft
         {
             get
@@ -742,8 +868,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHandleMarkerImageRight property.
+        /// The SelectionHandleMarkerImageRight property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap SelectionHandleMarkerImageRight
         {
             get
@@ -759,8 +886,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SelectionHighlightColor property.
+        /// The SelectionHighlightColor property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Vector4 SelectionHighlightColor
         {
             get
@@ -776,8 +904,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// DecorationBoundingBox property.
+        /// The DecorationBoundingBox property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Rectangle DecorationBoundingBox
         {
             get
@@ -793,8 +922,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// EnableMarkup property.
+        /// The EnableMarkup property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public bool EnableMarkup
         {
             get
@@ -810,8 +940,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputColor property.
+        /// The InputColor property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Vector4 InputColor
         {
             get
@@ -827,8 +958,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputFontFamily property.
+        /// The InputFontFamily property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string InputFontFamily
         {
             get
@@ -844,8 +976,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputFontStyle property.
+        /// The InputFontStyle property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap InputFontStyle
         {
             get
@@ -861,8 +994,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputPointSize property.
+        /// The InputPointSize property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float InputPointSize
         {
             get
@@ -878,8 +1012,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// LineSpacing property.
+        /// The LineSpacing property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float LineSpacing
         {
             get
@@ -895,8 +1030,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputLineSpacing property.
+        /// The InputLineSpacing property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float InputLineSpacing
         {
             get
@@ -912,8 +1048,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Underline property.
+        /// The Underline property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap Underline
         {
             get
@@ -929,8 +1066,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputUnderline property.
+        /// The InputUnderline property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string InputUnderline
         {
             get
@@ -946,8 +1084,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Shadow property.
+        /// The Shadow property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public PropertyMap Shadow
         {
             get
@@ -963,8 +1102,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputShadow property.
+        /// The InputShadow property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string InputShadow
         {
             get
@@ -980,8 +1120,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Emboss property.
+        /// The Emboss property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string Emboss
         {
             get
@@ -997,8 +1138,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputEmboss property.
+        /// The InputEmboss property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string InputEmboss
         {
             get
@@ -1014,14 +1156,15 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Outline property.
+        /// The Outline property.
         /// </summary>
-        public string Outline
+        /// <since_tizen> 3 </since_tizen>
+        public PropertyMap Outline
         {
             get
             {
-                string temp;
-                GetProperty(TextEditor.Property.OUTLINE).Get(out temp);
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.OUTLINE).Get(temp);
                 return temp;
             }
             set
@@ -1031,8 +1174,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// InputOutline property.
+        /// The InputOutline property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string InputOutline
         {
             get
@@ -1048,8 +1192,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SmoothScroll property.
+        /// The SmoothScroll property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public bool SmoothScroll
         {
             get
@@ -1065,8 +1210,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// SmoothScrollDuration property.
+        /// The SmoothScrollDuration property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float SmoothScrollDuration
         {
             get
@@ -1082,8 +1228,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// EnableScrollBar property.
+        /// The EnableScrollBar property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public bool EnableScrollBar
         {
             get
@@ -1099,8 +1246,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// ScrollBarShowDuration property.
+        /// The ScrollBarShowDuration property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float ScrollBarShowDuration
         {
             get
@@ -1116,8 +1264,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// ScrollBarFadeDuration property.
+        /// The ScrollBarFadeDuration property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float ScrollBarFadeDuration
         {
             get
@@ -1133,8 +1282,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// PixelSize property.
+        /// The PixelSize property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public float PixelSize
         {
             get
@@ -1150,8 +1300,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// The line count of text.
+        /// The line count of the text.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public int LineCount
         {
             get
@@ -1165,6 +1316,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// The text to display when the TextEditor is empty and inactive.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public string PlaceholderText
         {
             get
@@ -1180,8 +1332,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// The placeholder-text color.
+        /// The Placeholder text color.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public Color PlaceholderTextColor
         {
             get
@@ -1197,8 +1350,9 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Enable selection property.
+        /// The EnableSelection property.
         /// </summary>
+        /// <since_tizen> 3 </since_tizen>
         public bool EnableSelection
         {
             get
@@ -1214,29 +1368,30 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Placeholder property.
-        /// Gets/Sets the placeholder : text, color, font family, font style, point size, and pixel size.
+        /// The Placeholder property.
+        /// Gets or sets the placeholder: text, color, font family, font style, point size, and pixel size.
         /// </summary>
         /// <example>
         /// The following example demonstrates how to set the placeholder property.
         /// <code>
         /// PropertyMap propertyMap = new PropertyMap();
-        /// propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text"));
-        /// propertyMap.Add("placeholderTextFocused", new PropertyValue("Setting Placeholder Text Focused"));
-        /// propertyMap.Add("placeholderColor", new PropertyValue(Color.Red));
-        /// propertyMap.Add("placeholderFontFamily", new PropertyValue("Arial"));
-        /// propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f));
+        /// propertyMap.Add("text", new PropertyValue("Setting Placeholder Text"));
+        /// propertyMap.Add("textFocused", new PropertyValue("Setting Placeholder Text Focused"));
+        /// propertyMap.Add("color", new PropertyValue(Color.Red));
+        /// propertyMap.Add("fontFamily", new PropertyValue("Arial"));
+        /// propertyMap.Add("pointSize", new PropertyValue(12.0f));
         ///
         /// PropertyMap fontStyleMap = new PropertyMap();
         /// fontStyleMap.Add("weight", new PropertyValue("bold"));
         /// fontStyleMap.Add("width", new PropertyValue("condensed"));
         /// fontStyleMap.Add("slant", new PropertyValue("italic"));
-        /// propertyMap.Add("placeholderFontStyle", new PropertyValue(fontStyleMap));
+        /// propertyMap.Add("fontStyle", new PropertyValue(fontStyleMap));
         ///
         /// TextEditor editor = new TextEditor();
         /// editor.Placeholder = propertyMap;
         /// </code>
         /// </example>
+        /// <since_tizen> 3 </since_tizen>
         public Tizen.NUI.PropertyMap Placeholder
         {
             get
@@ -1252,45 +1407,24 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// LineWrapMode property.<br>
-        /// line wrap mode when the text lines over layout width.<br>
+        /// The LineWrapMode property.<br />
+        /// The line wrap mode when the text lines over the layout width.<br />
         /// </summary>
+        /// <since_tizen> 4 </since_tizen>
         public LineWrapMode LineWrapMode
         {
             get
             {
-                string temp;
+                int temp;
                 if(GetProperty(TextEditor.Property.LINE_WRAP_MODE).Get(out temp) == false)
                 {
                     NUILog.Error("LineWrapMode get error!");
                 }
-                switch (temp)
-                {
-                    case "WORD":
-                    return LineWrapMode.Word;
-                    case "CHARACTER":
-                    return LineWrapMode.Character;
-                    default:
-                    return LineWrapMode.Word;
-                }
+                return (LineWrapMode)temp;
             }
             set
             {
-                string temp = "";
-                switch (value)
-                {
-                    case LineWrapMode.Word:
-                    {
-                        temp = "WORD";
-                        break;
-                    }
-                    case LineWrapMode.Character:
-                    {
-                        temp = "CHARACTER";
-                        break;
-                    }
-                }
-                SetProperty(TextEditor.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue(temp));
+                SetProperty(TextEditor.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue((int)value));
             }
         }