[Tizen] changes for preview#4 release
authordongsug.song <dongsug.song@samsung.com>
Tue, 13 Jun 2017 10:29:58 +0000 (19:29 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 13 Jun 2017 10:29:58 +0000 (19:29 +0900)
Change-Id: I5206ad1726c7602c9df0f3a250c6d46bbe3a19ee
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
16 files changed:
src/Tizen.NUI/src/internal/Builder.cs
src/Tizen.NUI/src/internal/Size.cs
src/Tizen.NUI/src/internal/Slider.cs [deleted file]
src/Tizen.NUI/src/internal/VideoViewSignal.cs
src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs [new file with mode: 0755]
src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs [new file with mode: 0755]
src/Tizen.NUI/src/public/BaseComponents/TableView.cs [new file with mode: 0755]
src/Tizen.NUI/src/public/BaseComponents/VideoView.cs [new file with mode: 0755]
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/FlexContainer.cs [deleted file]
src/Tizen.NUI/src/public/NUIConstants.cs
src/Tizen.NUI/src/public/Scrollable.cs [deleted file]
src/Tizen.NUI/src/public/TableView.cs [deleted file]
src/Tizen.NUI/src/public/UIComponents/Slider.cs [new file with mode: 0755]
src/Tizen.NUI/src/public/VideoView.cs [deleted file]
src/Tizen.NUI/src/public/Window.cs

index 0001b891570f1e97704f40b1745e807be1282c8c..6e5a521049fa6b3ac931fa5fcdb72dcaac999249 100755 (executable)
@@ -32,7 +32,7 @@ namespace Tizen.NUI
     using Tizen.NUI.BaseComponents;
 
 
-    internal class Builder : BaseHandle
+    public class Builder : BaseHandle
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
index c656b01e6541e9e46d20189e1a12f4fde2d2709e..83cd23b34e3105878a72cd3f0dd7d19b7f2d2f1b 100755 (executable)
  */
 
 namespace Tizen.NUI
-{
-
-    /// <summary>
-    /// Three dimensional size
-    /// </summary>
-    internal class Size : global::System.IDisposable
+{\r
+\r
+    /*********************************************************************************/\r
+    /*** will be removed/deprecated                                                  ***/\r
+    /*********************************************************************************/\r
+    public class Size : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         protected bool swigCMemOwn;
diff --git a/src/Tizen.NUI/src/internal/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs
deleted file mode 100755 (executable)
index a6abd07..0000000
+++ /dev/null
@@ -1,775 +0,0 @@
-/** 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.
-*
-*/
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI.UIComponents
-{
-
-    using System;
-    using System.Runtime.InteropServices;
-    using Tizen.NUI.BaseComponents;
-
-    /// <summary>
-    /// Slider is a control to enable sliding an indicator between two values.
-    /// </summary>
-    internal class Slider : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            // By default, we do not want the position to use the anchor point
-            PositionUsesAnchorPoint = false;
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Slider obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        protected override void Dispose(DisposeTypes type)
-        {
-            if (disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            //Unreference this from if a static instance refer to this.
-            ViewRegistry.UnregisterView(this);
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_Slider(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-        /// <summary>
-        /// Value changed event arguments.
-        /// </summary>
-        public class ValueChangedEventArgs : EventArgs
-        {
-            private Slider _slider;
-            private float _slideValue;
-
-            /// <summary>
-            /// Slider.
-            /// </summary>
-            public Slider Slider
-            {
-                get
-                {
-                    return _slider;
-                }
-                set
-                {
-                    _slider = value;
-                }
-            }
-
-            /// <summary>
-            /// Slider value.
-            /// </summary>
-            public float SlideValue
-            {
-                get
-                {
-                    return _slideValue;
-                }
-                set
-                {
-                    _slideValue = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sliding finished event arguments.
-        /// </summary>
-        public class SlidingFinishedEventArgs : EventArgs
-        {
-            private Slider _slider;
-            private float _slideValue;
-
-            /// <summary>
-            /// Slider.
-            /// </summary>
-            public Slider Slider
-            {
-                get
-                {
-                    return _slider;
-                }
-                set
-                {
-                    _slider = value;
-                }
-            }
-
-            /// <summary>
-            /// Slider value.
-            /// </summary>
-            public float SlideValue
-            {
-                get
-                {
-                    return _slideValue;
-                }
-                set
-                {
-                    _slideValue = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Mark reached event arguments.
-        /// </summary>
-        public class MarkReachedEventArgs : EventArgs
-        {
-            private Slider _slider;
-            private int _slideValue;
-
-            /// <summary>
-            /// Slider.
-            /// </summary>
-            public Slider Slider
-            {
-                get
-                {
-                    return _slider;
-                }
-                set
-                {
-                    _slider = value;
-                }
-            }
-
-            /// <summary>
-            /// Slider value.
-            /// </summary>
-            public int SlideValue
-            {
-                get
-                {
-                    return _slideValue;
-                }
-                set
-                {
-                    _slideValue = value;
-                }
-            }
-        }
-
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate bool ValueChangedCallbackDelegate(IntPtr slider, float slideValue);
-        private EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> _sliderValueChangedEventHandler;
-        private ValueChangedCallbackDelegate _sliderValueChangedCallbackDelegate;
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate bool SlidingFinishedCallbackDelegate(IntPtr slider, float slideValue);
-        private EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> _sliderSlidingFinishedEventHandler;
-        private SlidingFinishedCallbackDelegate _sliderSlidingFinishedCallbackDelegate;
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate bool MarkReachedCallbackDelegate(IntPtr slider, int slideValue);
-        private EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> _sliderMarkReachedEventHandler;
-        private MarkReachedCallbackDelegate _sliderMarkReachedCallbackDelegate;
-
-        /// <summary>
-        /// Event emitted when the slider value changes.
-        /// </summary>
-        public event EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> ValueChanged
-        {
-            add
-            {
-                if (_sliderValueChangedEventHandler == null)
-                {
-                    _sliderValueChangedCallbackDelegate = (OnValueChanged);
-                    ValueChangedSignal().Connect(_sliderValueChangedCallbackDelegate);
-                }
-                _sliderValueChangedEventHandler += value;
-            }
-            remove
-            {
-                _sliderValueChangedEventHandler -= value;
-                if (_sliderValueChangedEventHandler == null && ValueChangedSignal().Empty() == false)
-                {
-                    ValueChangedSignal().Disconnect(_sliderValueChangedCallbackDelegate);
-                }
-            }
-        }
-
-        // Callback for Slider ValueChanged signal
-        private bool OnValueChanged(IntPtr slider, float slideValue)
-        {
-            ValueChangedEventArgs e = new ValueChangedEventArgs();
-
-            // Populate all members of "e" (ValueChangedEventArgs) with real page
-            e.Slider = Slider.GetSliderFromPtr(slider);
-            e.SlideValue = slideValue;
-
-            if (_sliderValueChangedEventHandler != null)
-            {
-                //here we send all page to user event handlers
-                return _sliderValueChangedEventHandler(this, e);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Event emitted when the sliding is finished.
-        /// </summary>
-        public event EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> SlidingFinished
-        {
-            add
-            {
-                if (_sliderSlidingFinishedEventHandler == null)
-                {
-                    _sliderSlidingFinishedCallbackDelegate = (OnSlidingFinished);
-                    SlidingFinishedSignal().Connect(_sliderSlidingFinishedCallbackDelegate);
-                }
-                _sliderSlidingFinishedEventHandler += value;
-            }
-            remove
-            {
-                _sliderSlidingFinishedEventHandler -= value;
-                if (_sliderSlidingFinishedEventHandler == null && SlidingFinishedSignal().Empty() == false)
-                {
-                    SlidingFinishedSignal().Disconnect(_sliderSlidingFinishedCallbackDelegate);
-                }
-            }
-        }
-
-        // Callback for Slider SlidingFinished signal
-        private bool OnSlidingFinished(IntPtr slider, float slideValue)
-        {
-            SlidingFinishedEventArgs e = new SlidingFinishedEventArgs();
-
-            // Populate all members of "e" (SlidingFinishedEventArgs) with real page
-            e.Slider = Slider.GetSliderFromPtr(slider);
-            e.SlideValue = slideValue;
-
-            if (_sliderSlidingFinishedEventHandler != null)
-            {
-                //here we send all page to user event handlers
-                return _sliderSlidingFinishedEventHandler(this, e);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Event emitted when the slider handle reaches a mark.
-        /// </summary>
-        public event EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> MarkReached
-        {
-            add
-            {
-                if (_sliderMarkReachedEventHandler == null)
-                {
-                    _sliderMarkReachedCallbackDelegate = (OnMarkReached);
-                    MarkReachedSignal().Connect(_sliderMarkReachedCallbackDelegate);
-                }
-                _sliderMarkReachedEventHandler += value;
-            }
-            remove
-            {
-                _sliderMarkReachedEventHandler -= value;
-                if (_sliderMarkReachedEventHandler == null && MarkReachedSignal().Empty() == false)
-                {
-                    MarkReachedSignal().Disconnect(_sliderMarkReachedCallbackDelegate);
-                }
-            }
-        }
-
-        // Callback for Slider MarkReached signal
-        private bool OnMarkReached(IntPtr slider, int slideValue)
-        {
-            MarkReachedEventArgs e = new MarkReachedEventArgs();
-
-            // Populate all members of "e" (MarkReachedEventArgs) with real page
-            e.Slider = Slider.GetSliderFromPtr(slider);
-            e.SlideValue = slideValue;
-
-            if (_sliderMarkReachedEventHandler != null)
-            {
-                //here we send all page to user event handlers
-                return _sliderMarkReachedEventHandler(this, e);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Get Slider from the pointer.
-        /// </summary>
-        /// <param name="cPtr">The pointer of Slider</param>
-        /// <returns>Object of Slider type</returns>
-        internal static Slider GetSliderFromPtr(global::System.IntPtr cPtr)
-        {
-            Slider ret = new Slider(cPtr, false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal class Property : global::System.IDisposable
-        {
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-            protected bool swigCMemOwn;
-
-            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
-            {
-                swigCMemOwn = cMemoryOwn;
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            }
-
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
-            {
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-            }\r
-\r
-            //A Flag to check who called Dispose(). (By User or DisposeQueue)\r
-            private bool isDisposeQueued = false;\r
-            //A Flat to check if it is already disposed.\r
-            protected bool disposed = false;
-
-            ~Property()\r
-            {\r
-                if (!isDisposeQueued)\r
-                {\r
-                    isDisposeQueued = true;\r
-                    DisposeQueue.Instance.Add(this);\r
-                }\r
-            }\r
-\r
-            public void Dispose()\r
-            {\r
-                //Throw excpetion if Dispose() is called in separate thread.\r
-                if (!Window.IsInstalled())\r
-                {\r
-                    throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");\r
-                }\r
-\r
-                if (isDisposeQueued)\r
-                {\r
-                    Dispose(DisposeTypes.Implicit);\r
-                }\r
-                else\r
-                {\r
-                    Dispose(DisposeTypes.Explicit);\r
-                    System.GC.SuppressFinalize(this);\r
-                }\r
-            }\r
-\r
-            protected virtual void Dispose(DisposeTypes type)\r
-            {\r
-                if (disposed)\r
-                {\r
-                    return;\r
-                }\r
-\r
-                if (type == DisposeTypes.Explicit)\r
-                {\r
-                    //Called by User\r
-                    //Release your own managed resources here.\r
-                    //You should release all of your own disposable objects here.\r
-\r
-                }\r
-\r
-                //Release your own unmanaged resources here.\r
-                //You should not access any managed member here except static instance.\r
-                //because the execution order of Finalizes is non-deterministic.\r
-\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_Slider_Property(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-\r
-                disposed = true;\r
-            }
-
-            internal Property() : this(NDalicPINVOKE.new_Slider_Property(), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            internal static readonly int LOWER_BOUND = NDalicPINVOKE.Slider_Property_LOWER_BOUND_get();
-            internal static readonly int UPPER_BOUND = NDalicPINVOKE.Slider_Property_UPPER_BOUND_get();
-            internal static readonly int VALUE = NDalicPINVOKE.Slider_Property_VALUE_get();
-            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.Slider_Property_TRACK_VISUAL_get();
-            internal static readonly int HANDLE_VISUAL = NDalicPINVOKE.Slider_Property_HANDLE_VISUAL_get();
-            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.Slider_Property_PROGRESS_VISUAL_get();
-            internal static readonly int POPUP_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_VISUAL_get();
-            internal static readonly int POPUP_ARROW_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_ARROW_VISUAL_get();
-            internal static readonly int DISABLED_COLOR = NDalicPINVOKE.Slider_Property_DISABLED_COLOR_get();
-            internal static readonly int VALUE_PRECISION = NDalicPINVOKE.Slider_Property_VALUE_PRECISION_get();
-            internal static readonly int SHOW_POPUP = NDalicPINVOKE.Slider_Property_SHOW_POPUP_get();
-            internal static readonly int SHOW_VALUE = NDalicPINVOKE.Slider_Property_SHOW_VALUE_get();
-            internal static readonly int MARKS = NDalicPINVOKE.Slider_Property_MARKS_get();
-            internal static readonly int SNAP_TO_MARKS = NDalicPINVOKE.Slider_Property_SNAP_TO_MARKS_get();
-            internal static readonly int MARK_TOLERANCE = NDalicPINVOKE.Slider_Property_MARK_TOLERANCE_get();
-
-        }
-
-        /// <summary>
-        /// Creates the Slider control.
-        /// </summary>
-        public Slider() : this(NDalicPINVOKE.Slider_New(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        internal Slider(Slider handle) : this(NDalicPINVOKE.new_Slider__SWIG_1(Slider.getCPtr(handle)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal Slider Assign(Slider handle)
-        {
-            Slider ret = new Slider(NDalicPINVOKE.Slider_Assign(swigCPtr, Slider.getCPtr(handle)), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Downcasts an Object handle to Slider.<br>
-        /// If handle points to a Slider, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
-        /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a Slider or an uninitialized handle</returns>
-        public new static Slider DownCast(BaseHandle handle)
-        {
-            Slider ret = new Slider(NDalicPINVOKE.Slider_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal SliderValueChangedSignal ValueChangedSignal()
-        {
-            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_ValueChangedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal SliderValueChangedSignal SlidingFinishedSignal()
-        {
-            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_SlidingFinishedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal SliderMarkReachedSignal MarkReachedSignal()
-        {
-            SliderMarkReachedSignal ret = new SliderMarkReachedSignal(NDalicPINVOKE.Slider_MarkReachedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Lower bound property
-        /// </summary>
-        public float LowerBound
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(Slider.Property.LOWER_BOUND).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.LOWER_BOUND, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Upper bound property
-        /// </summary>
-        public float UpperBound
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(Slider.Property.UPPER_BOUND).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.UPPER_BOUND, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Value property
-        /// </summary>
-        public float Value
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(Slider.Property.VALUE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.VALUE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Track visual property
-        /// </summary>
-        public PropertyMap TrackVisual
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(Slider.Property.TRACK_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Handle visual property
-        /// </summary>
-        public PropertyMap HandleVisual
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(Slider.Property.HANDLE_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.HANDLE_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Progress visual property
-        /// </summary>
-        public PropertyMap ProgressVisual
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(Slider.Property.PROGRESS_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Popup visual property
-        /// </summary>
-        public PropertyMap PopupVisual
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(Slider.Property.POPUP_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.POPUP_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Popup arrow visual property
-        /// </summary>
-        public PropertyMap PopupArrowVisual
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(Slider.Property.POPUP_ARROW_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.POPUP_ARROW_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Disable color property
-        /// </summary>
-        public Vector4 DisabledColor
-        {
-            get
-            {
-                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-                GetProperty(Slider.Property.DISABLED_COLOR).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.DISABLED_COLOR, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Value presicion property
-        /// </summary>
-        public int ValuePrecision
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(Slider.Property.VALUE_PRECISION).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.VALUE_PRECISION, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Show popup property
-        /// </summary>
-        public bool ShowPopup
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Slider.Property.SHOW_POPUP).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.SHOW_POPUP, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Show value property
-        /// </summary>
-        public bool ShowValue
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Slider.Property.SHOW_VALUE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.SHOW_VALUE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Marks property
-        /// </summary>
-        public Tizen.NUI.PropertyArray Marks
-        {
-            get
-            {
-                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                GetProperty(Slider.Property.MARKS).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.MARKS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Snap to marks property
-        /// </summary>
-        public bool SnapToMarks
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Slider.Property.SNAP_TO_MARKS).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.SNAP_TO_MARKS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// Mark tolerance property
-        /// </summary>
-        public float MarkTolerance
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(Slider.Property.MARK_TOLERANCE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Slider.Property.MARK_TOLERANCE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-    }
-
-}
index 18b79f82cc73f0a10e7d5716393794f48e045ddd..10ff327f5c5379a898c121349a046e018a7f541e 100755 (executable)
@@ -8,6 +8,8 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
+using Tizen.NUI.BaseComponents;
+
 namespace Tizen.NUI {
 
     internal class VideoViewSignal : global::System.IDisposable {
diff --git a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
new file mode 100755 (executable)
index 0000000..9dc26f7
--- /dev/null
@@ -0,0 +1,284 @@
+/** 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.
+*
+*/
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI.BaseComponents
+{
+    /// <summary>
+    /// FlexContainer implements a subset of the flexbox spec (defined by W3C):https://www.w3.org/TR/css3-flexbox/<br>
+    /// It aims at providing a more efficient way to lay out, align and distribute space among items in the container, even when their size is unknown or dynamic.<br>
+    /// FlexContainer has the ability to alter the width and height of its children (i.e. flex items) to fill the available space in the best possible way on different screen sizes.<br>
+    /// FlexContainer can expand items to fill available free space, or shrink them to prevent overflow.<br>
+    /// </summary>
+    public class FlexContainer : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            // By default, we do not want the position to use the anchor point
+            PositionUsesAnchorPoint = false;
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if(disposed)
+            {
+                return;
+            }
+
+            if(type == DisposeTypes.Explicit)
+            {
+                //Called by User
+                //Release your own managed resources here.
+                //You should release all of your own disposable objects here.
+            }
+
+            //Release your own unmanaged resources here.
+            //You should not access any managed member here except static instance.
+            //because the execution order of Finalizes is non-deterministic.
+
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)
+            {
+                if (swigCMemOwn)
+                {
+                    swigCMemOwn = false;
+                    NDalicPINVOKE.delete_FlexContainer(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+
+        internal class Property
+        {
+            internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();
+            internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();
+            internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();
+            internal static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();
+            internal static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();
+            internal static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();
+
+        }
+
+        /// <summary>
+        /// Enumeration for the instance of child properties belonging to the FlexContainer class.
+        /// </summary>
+        public class ChildProperty
+        {
+            internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();
+            internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();
+            internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();
+        }
+
+        /// <summary>
+        /// Creates a FlexContainer handle.
+        /// Calling member functions with an uninitialized handle is not allowed.
+        /// </summary>
+        public FlexContainer() : this(NDalicPINVOKE.FlexContainer_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        internal new static FlexContainer DownCast(BaseHandle handle)
+        {
+            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Enumeration for the direction of the main axis in the flex container. This determines
+        /// the direction that flex items are laid out in the flex container.
+        /// </summary>
+        public enum FlexDirectionType
+        {
+            Column,
+            ColumnReverse,
+            Row,
+            RowReverse
+        }
+
+        /// <summary>
+        /// Enumeration for the primary direction in which content is ordered in the flex container
+        /// and on which sides the ?�start??and ?�end??are.
+        /// </summary>
+        public enum ContentDirectionType
+        {
+            Inherit,
+            LTR,
+            RTL
+        }
+
+        /// <summary>
+        /// Enumeration for the alignment of the flex items when the items do not use all available
+        /// space on the main-axis.
+        /// </summary>
+        public enum Justification
+        {
+            JustifyFlexStart,
+            JustifyCenter,
+            JustifyFlexEnd,
+            JustifySpaceBetween,
+            JustifySpaceAround
+        }
+
+        /// <summary>
+        /// Enumeration for the alignment of the flex items or lines when the items or lines do not
+        /// use all the available space on the cross-axis.
+        /// </summary>
+        public enum Alignment
+        {
+            AlignAuto,
+            AlignFlexStart,
+            AlignCenter,
+            AlignFlexEnd,
+            AlignStretch
+        }
+
+        /// <summary>
+        /// Enumeration for the wrap type of the flex container when there is no enough room for
+        /// all the items on one flex line.
+        /// </summary>
+        public enum WrapType
+        {
+            NoWrap,
+            Wrap
+        }
+
+        /// <summary>
+        /// The primary direction in which content is ordered
+        /// </summary>
+        public ContentDirectionType ContentDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(out temp);
+                return (ContentDirectionType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The direction of the main-axis which determines the direction that flex items are laid out
+        /// </summary>
+        public FlexDirectionType FlexDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(out temp);
+                return (FlexDirectionType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// Whether the flex items should wrap or not if there is no enough room for them on one flex line
+        /// </summary>
+        public WrapType FlexWrap
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_WRAP).Get(out temp);
+                return (WrapType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the main-axis
+        /// </summary>
+        public Justification JustifyContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(out temp);
+                return (Justification)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the cross-axis
+        /// </summary>
+        public Alignment AlignItems
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(out temp);
+                return (Alignment)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// Similar to "alignItems", but it aligns flex lines, so only works when there are multiple lines
+        /// </summary>
+        public Alignment AlignContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(out temp);
+                return (Alignment)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+    }
+
+}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs
new file mode 100755 (executable)
index 0000000..4f747aa
--- /dev/null
@@ -0,0 +1,497 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI.BaseComponents
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    public class Scrollable : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            // By default, we do not want the position to use the anchor point
+            PositionUsesAnchorPoint = false;
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Scrollable obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                //Called by User
+                //Release your own managed resources here.
+                //You should release all of your own disposable objects here.
+
+            }
+
+            //Release your own unmanaged resources here.
+            //You should not access any managed member here except static instance.
+            //because the execution order of Finalizes is non-deterministic.
+
+            //Unreference this from if a static instance refer to this.
+            ViewRegistry.UnregisterView(this);
+
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)
+            {
+                if (swigCMemOwn)
+                {
+                    swigCMemOwn = false;
+                    NDalicPINVOKE.delete_Scrollable(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+        public class StartedEventArgs : EventArgs
+        {
+            private Vector2 _vector2;
+
+            public Vector2 Vector2
+            {
+                get
+                {
+                    return _vector2;
+                }
+                set
+                {
+                    _vector2 = value;
+                }
+            }
+        }
+
+        public class UpdatedEventArgs : EventArgs
+        {
+            private Vector2 _vector2;
+
+            public Vector2 Vector2
+            {
+                get
+                {
+                    return _vector2;
+                }
+                set
+                {
+                    _vector2 = value;
+                }
+            }
+        }
+
+        public class CompletedEventArgs : EventArgs
+        {
+            private Vector2 _vector2;
+
+            public Vector2 Vector2
+            {
+                get
+                {
+                    return _vector2;
+                }
+                set
+                {
+                    _vector2 = value;
+                }
+            }
+        }
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void StartedCallbackDelegate(IntPtr vector2);
+        private DaliEventHandler<object, StartedEventArgs> _scrollableStartedEventHandler;
+        private StartedCallbackDelegate _scrollableStartedCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void UpdatedCallbackDelegate(IntPtr vector2);
+        private DaliEventHandler<object, UpdatedEventArgs> _scrollableUpdatedEventHandler;
+        private UpdatedCallbackDelegate _scrollableUpdatedCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void CompletedCallbackDelegate(IntPtr vector2);
+        private DaliEventHandler<object, CompletedEventArgs> _scrollableCompletedEventHandler;
+        private CompletedCallbackDelegate _scrollableCompletedCallbackDelegate;
+
+        public event DaliEventHandler<object, StartedEventArgs> ScrollStarted
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_scrollableStartedEventHandler == null)
+                    {
+                        _scrollableStartedEventHandler += value;
+
+                        _scrollableStartedCallbackDelegate = new StartedCallbackDelegate(OnStarted);
+                        this.ScrollStartedSignal().Connect(_scrollableStartedCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_scrollableStartedEventHandler != null)
+                    {
+                        this.ScrollStartedSignal().Disconnect(_scrollableStartedCallbackDelegate);
+                    }
+
+                    _scrollableStartedEventHandler -= value;
+                }
+            }
+        }
+
+        private void OnStarted(IntPtr vector2)
+        {
+            StartedEventArgs e = new StartedEventArgs();
+
+            // Populate all members of "e" (StartedEventArgs) with real data
+            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
+
+            if (_scrollableStartedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _scrollableStartedEventHandler(this, e);
+            }
+
+        }
+
+        public event DaliEventHandler<object, UpdatedEventArgs> ScrollUpdated
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_scrollableUpdatedEventHandler == null)
+                    {
+                        _scrollableUpdatedEventHandler += value;
+
+                        _scrollableUpdatedCallbackDelegate = new UpdatedCallbackDelegate(OnUpdated);
+                        this.ScrollUpdatedSignal().Connect(_scrollableUpdatedCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_scrollableUpdatedEventHandler != null)
+                    {
+                        this.ScrollUpdatedSignal().Disconnect(_scrollableUpdatedCallbackDelegate);
+                    }
+
+                    _scrollableUpdatedEventHandler -= value;
+                }
+            }
+        }
+
+        private void OnUpdated(IntPtr vector2)
+        {
+            UpdatedEventArgs e = new UpdatedEventArgs();
+
+            // Populate all members of "e" (UpdatedEventArgs) with real data
+            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
+
+            if (_scrollableUpdatedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _scrollableUpdatedEventHandler(this, e);
+            }
+
+        }
+
+        public event DaliEventHandler<object, CompletedEventArgs> ScrollCompleted
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_scrollableCompletedEventHandler == null)
+                    {
+                        _scrollableCompletedEventHandler += value;
+
+                        _scrollableCompletedCallbackDelegate = new CompletedCallbackDelegate(OnCompleted);
+                        this.ScrollCompletedSignal().Connect(_scrollableCompletedCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_scrollableCompletedEventHandler != null)
+                    {
+                        this.ScrollCompletedSignal().Disconnect(_scrollableCompletedCallbackDelegate);
+                    }
+
+                    _scrollableCompletedEventHandler -= value;
+                }
+            }
+        }
+
+        private void OnCompleted(IntPtr vector2)
+        {
+            CompletedEventArgs e = new CompletedEventArgs();
+
+            // Populate all members of "e" (CompletedEventArgs) with real data
+            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
+
+            if (_scrollableCompletedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _scrollableCompletedEventHandler(this, e);
+            }
+
+        }
+
+
+        public class Property
+        {
+            public static readonly int OVERSHOOT_EFFECT_COLOR = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get();
+            public static readonly int OVERSHOOT_ANIMATION_SPEED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get();
+            public static readonly int OVERSHOOT_ENABLED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ENABLED_get();
+            public static readonly int OVERSHOOT_SIZE = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_SIZE_get();
+            public static readonly int SCROLL_TO_ALPHA_FUNCTION = NDalicPINVOKE.Scrollable_Property_SCROLL_TO_ALPHA_FUNCTION_get();
+            public static readonly int SCROLL_RELATIVE_POSITION = NDalicPINVOKE.Scrollable_Property_SCROLL_RELATIVE_POSITION_get();
+            public static readonly int SCROLL_POSITION_MIN = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_get();
+            public static readonly int SCROLL_POSITION_MIN_X = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_X_get();
+            public static readonly int SCROLL_POSITION_MIN_Y = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_Y_get();
+            public static readonly int SCROLL_POSITION_MAX = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_get();
+            public static readonly int SCROLL_POSITION_MAX_X = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_X_get();
+            public static readonly int SCROLL_POSITION_MAX_Y = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_Y_get();
+            public static readonly int CAN_SCROLL_VERTICAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_VERTICAL_get();
+            public static readonly int CAN_SCROLL_HORIZONTAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_HORIZONTAL_get();
+
+        }
+
+        public Scrollable() : this(NDalicPINVOKE.new_Scrollable__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal new static Scrollable DownCast(BaseHandle handle)
+        {
+            Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private bool IsOvershootEnabled()
+        {
+            bool ret = NDalicPINVOKE.Scrollable_IsOvershootEnabled(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private void SetOvershootEnabled(bool enable)
+        {
+            NDalicPINVOKE.Scrollable_SetOvershootEnabled(swigCPtr, enable);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private void SetOvershootEffectColor(Vector4 color)
+        {
+            NDalicPINVOKE.Scrollable_SetOvershootEffectColor(swigCPtr, Vector4.getCPtr(color));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private Vector4 GetOvershootEffectColor()
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Scrollable_GetOvershootEffectColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private void SetOvershootAnimationSpeed(float pixelsPerSecond)
+        {
+            NDalicPINVOKE.Scrollable_SetOvershootAnimationSpeed(swigCPtr, pixelsPerSecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private float GetOvershootAnimationSpeed()
+        {
+            float ret = NDalicPINVOKE.Scrollable_GetOvershootAnimationSpeed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ScrollableSignal ScrollStartedSignal()
+        {
+            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollStartedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ScrollableSignal ScrollUpdatedSignal()
+        {
+            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollUpdatedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ScrollableSignal ScrollCompletedSignal()
+        {
+            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollCompletedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Vector4 OvershootEffectColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Scrollable.Property.OVERSHOOT_EFFECT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.OVERSHOOT_EFFECT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float OvershootAnimationSpeed
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public bool OvershootEnabled
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Scrollable.Property.OVERSHOOT_ENABLED).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.OVERSHOOT_ENABLED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public Vector2 OvershootSize
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(Scrollable.Property.OVERSHOOT_SIZE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.OVERSHOOT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int ScrollToAlphaFunction
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public Vector2 ScrollRelativePosition
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(Scrollable.Property.SCROLL_RELATIVE_POSITION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.SCROLL_RELATIVE_POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public Vector2 ScrollPositionMin
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(Scrollable.Property.SCROLL_POSITION_MIN).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.SCROLL_POSITION_MIN, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public Vector2 ScrollPositionMax
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(Scrollable.Property.SCROLL_POSITION_MAX).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.SCROLL_POSITION_MAX, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public bool CanScrollVertical
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public bool CanScrollHorizontal
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Tizen.NUI/src/public/BaseComponents/TableView.cs b/src/Tizen.NUI/src/public/BaseComponents/TableView.cs
new file mode 100755 (executable)
index 0000000..7d8c0c7
--- /dev/null
@@ -0,0 +1,719 @@
+/** 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.
+*
+*/
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI.BaseComponents
+{
+
+    /// <summary>
+    /// TableView is a layout container for aligning child actors in a grid like layout.<br>
+    /// TableView constrains the x and y position and width and height of the child actors.<br>
+    /// z position and depth are left intact so that 3D model actors can also be laid out
+    /// in a grid without loosing their depth scaling.<br>
+    /// </summary>
+    public class TableView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal TableView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TableView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            // By default, we do not want the position to use the anchor point
+            PositionUsesAnchorPoint = false;
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TableView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if(disposed)
+            {
+                return;
+            }
+
+            if(type == DisposeTypes.Explicit)
+            {
+                //Called by User
+                //Release your own managed resources here.
+                //You should release all of your own disposable objects here.
+            }
+
+            //Release your own unmanaged resources here.
+            //You should not access any managed member here except static instance.
+            //because the execution order of Finalizes is non-deterministic.
+
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)
+            {
+                if (swigCMemOwn)
+                {
+                    swigCMemOwn = false;
+                    NDalicPINVOKE.delete_TableView(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+
+        internal class Property
+        {
+            internal static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get();
+            internal static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get();
+            internal static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get();
+            internal static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get();
+            internal static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get();
+        }
+
+        internal class ChildProperty
+        {
+            internal static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get();
+            internal static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get();
+            internal static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get();
+            internal static readonly int CELL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get();
+            internal static readonly int CELL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get();
+        }
+
+        /// <summary>
+        /// Class to specify layout position for child view.
+        /// </summary>
+        public class CellPosition : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal CellPosition(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CellPosition obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) 
+
+            //A Flag to check who called Dispose(). (By User or DisposeQueue)
+            private bool isDisposeQueued = false;
+            //A Flat to check if it is already disposed.
+            protected bool disposed = false;
+
+            ~CellPosition()
+            {
+                if(!isDisposeQueued)
+                {
+                    isDisposeQueued = true;
+                    DisposeQueue.Instance.Add(this);
+                }
+            }
+
+            public void Dispose()
+            {
+                //Throw excpetion if Dispose() is called in separate thread.
+                if (!Window.IsInstalled())
+                {
+                    throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");
+                }
+
+                if (isDisposeQueued)
+                {
+                    Dispose(DisposeTypes.Implicit);
+                }
+                else
+                {
+                    Dispose(DisposeTypes.Explicit);
+                    System.GC.SuppressFinalize(this);
+                }
+            }
+
+            protected virtual void Dispose(DisposeTypes type)
+            {
+                if (disposed)
+                {
+                    return;
+                }
+
+                if(type == DisposeTypes.Explicit)
+                {
+                    //Called by User
+                    //Release your own managed resources here.
+                    //You should release all of your own disposable objects here.
+                }
+
+                //Release your own unmanaged resources here.
+                //You should not access any managed member here except static instance.
+                //because the execution order of Finalizes is non-deterministic.
+
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_TableView_CellPosition(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                disposed = true;
+            }
+
+            /// <summary>
+            /// Constructor.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            /// <param name="rowSpan">The row span initialized</param>
+            /// <param name="columnSpan">The column span initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan, uint columnSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_0(rowIndex, columnIndex, rowSpan, columnSpan), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            /// <param name="rowSpan">The row span initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_1(rowIndex, columnIndex, rowSpan), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_2(rowIndex, columnIndex), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            public CellPosition(uint rowIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_3(rowIndex), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Default constructor
+            /// </summary>
+            public CellPosition() : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_4(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Index of row
+            /// </summary>
+            public uint rowIndex
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_rowIndex_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowIndex_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Index of column
+            /// </summary>
+            public uint columnIndex
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_columnIndex_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnIndex_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Span of row
+            /// </summary>
+            public uint rowSpan
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_rowSpan_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowSpan_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Span of column
+            /// </summary>
+            public uint columnSpan
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_columnSpan_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnSpan_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Creates the TableView view.
+        /// </summary>
+        /// <param name="initialRows">initialRows for the table</param>
+        /// <param name="initialColumns">initialColumns for the table</param>
+        public TableView(uint initialRows, uint initialColumns) : this(NDalicPINVOKE.TableView_New(initialRows, initialColumns), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Copy constructor. Creates another handle that points to the same real object.
+        /// </summary>
+        /// <param name="handle">Handle to copy from</param>
+        public TableView(TableView handle) : this(NDalicPINVOKE.new_TableView__SWIG_1(TableView.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Downcasts a handle to TableView handle.<br>
+        /// If handle points to a TableView, the downcast produces valid handle.<br>
+        /// If not, the returned handle is left uninitialized.<br>
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a TableView or an uninitialized handle</returns>
+        internal new static TableView DownCast(BaseHandle handle)
+        {
+            TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Adds a child to the table.<br>
+        /// If the row or column index is outside the table, the table gets resized bigger.<br>
+        /// </summary>
+        /// <param name="child">The child to add</param>
+        /// <param name="position">The position for the child</param>
+        /// <returns>Tue if the addition succeeded and false if the cell is already occupied</returns>
+        public bool AddChild(View child, TableView.CellPosition position)
+        {
+            bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns a child from the given layout position.
+        /// </summary>
+        /// <param name="position">The position in the table</param>
+        /// <returns>Child that was in the cell or an uninitialized handle</returns>
+        public View GetChildAt(TableView.CellPosition position)
+        {
+            View ret = new View(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Removes a child from the given layout position.
+        /// </summary>
+        /// <param name="position">The position for the child to remove</param>
+        /// <returns>Child that was removed or an uninitialized handle</returns>
+        public View RemoveChildAt(TableView.CellPosition position)
+        {
+            View ret = new View(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the child's layout position.
+        /// </summary>
+        /// <param name="child">The child to search for</param>
+        /// <param name="position">The position for the child</param>
+        /// <returns>true if the child was included in this TableView</returns>
+        public bool FindChildPosition(View child, TableView.CellPosition position)
+        {
+            bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Inserts a new row to given index.
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex of the new row</param>
+        public void InsertRow(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_InsertRow(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Deletes a row from the given index.<br>
+        /// Removed elements are deleted.<br>
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex of the row to delete</param>
+        public void DeleteRow(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_DeleteRow__SWIG_0(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Inserts a new column to the given index.
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex of the new column</param>
+        public void InsertColumn(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_InsertColumn(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Deletes a column from the given index.<br>
+        /// Removed elements are deleted.<br>
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex of the column to delete</param>
+        public void DeleteColumn(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_DeleteColumn__SWIG_0(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Resizes the TableView.
+        /// </summary>
+        /// <param name="rows">The rows for the table</param>
+        /// <param name="columns">The columns for the table</param>
+        public void Resize(uint rows, uint columns)
+        {
+            NDalicPINVOKE.TableView_Resize__SWIG_0(swigCPtr, rows, columns);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sets horizontal and vertical padding between cells.
+        /// </summary>
+        /// <param name="padding">Width and height</param>
+        public void SetCellPadding(Size2D padding)
+        {
+            NDalicPINVOKE.TableView_SetCellPadding(swigCPtr, Size2D.getCPtr(padding));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets the current padding as width and height.
+        /// </summary>
+        /// <returns>The current padding as width and height</returns>
+        public Vector2 GetCellPadding()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.TableView_GetCellPadding(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Specifies this row as fitting its height to its children.
+        /// </summary>
+        /// <param name="rowIndex">The row to set</param>
+        public void SetFitHeight(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_SetFitHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks if the row is a fit row.
+        /// </summary>
+        /// <param name="rowIndex">The row to check</param>
+        /// <returns>true if the row is fit</returns>
+        public bool IsFitHeight(uint rowIndex)
+        {
+            bool ret = NDalicPINVOKE.TableView_IsFitHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Specifies this column as fitting its width to its children.
+        /// </summary>
+        /// <param name="columnIndex">The column to set</param>
+        public void SetFitWidth(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_SetFitWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks if the column is a fit column.
+        /// </summary>
+        /// <param name="columnIndex">The column to check</param>
+        /// <returns>true if the column is fit</returns>
+        public bool IsFitWidth(uint columnIndex)
+        {
+            bool ret = NDalicPINVOKE.TableView_IsFitWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a row to have fixed height.<br>
+        /// Setting a fixed height of 0 has no effect.<br>
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex for row with fixed height</param>
+        /// <param name="height">The height in world coordinate units</param>
+        public void SetFixedHeight(uint rowIndex, float height)
+        {
+            NDalicPINVOKE.TableView_SetFixedHeight(swigCPtr, rowIndex, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a row's fixed height.
+        /// </summary>
+        /// <param name="rowIndex">The row index with fixed height</param>
+        /// <returns>height The height in world coordinate units</returns>
+        public float GetFixedHeight(uint rowIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetFixedHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a row to have relative height. Relative height means percentage of
+        /// the remainder of the table height after subtracting Padding and Fixed height rows.<br>
+        /// Setting a relative height of 0 has no effect.<br>
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex for row with relative height</param>
+        /// <param name="heightPercentage">The height percentage between 0.0f and 1.0f</param>
+        public void SetRelativeHeight(uint rowIndex, float heightPercentage)
+        {
+            NDalicPINVOKE.TableView_SetRelativeHeight(swigCPtr, rowIndex, heightPercentage);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a row's relative height.
+        /// </summary>
+        /// <param name="rowIndex">The row index with relative height</param>
+        /// <returns>Height in percentage units, between 0.0f and 1.0f</returns>
+        public float GetRelativeHeight(uint rowIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetRelativeHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a column to have fixed width.<br>
+        /// Setting a fixed width of 0 has no effect.<br>
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
+        /// <param name="width">The width in world coordinate units</param>
+        public void SetFixedWidth(uint columnIndex, float width)
+        {
+            NDalicPINVOKE.TableView_SetFixedWidth(swigCPtr, columnIndex, width);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a column's fixed width.
+        /// </summary>
+        /// <param name="columnIndex">The column index with fixed width</param>
+        /// <returns>Width in world coordinate units</returns>
+        public float GetFixedWidth(uint columnIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetFixedWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a column to have relative width. Relative width means percentage of
+        /// the remainder of table width after subtracting Padding and Fixed width columns.<br>
+        /// Setting a relative width of 0 has no effect.<br>
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
+        /// <param name="widthPercentage">The widthPercentage between 0.0f and 1.0f</param>
+        public void SetRelativeWidth(uint columnIndex, float widthPercentage)
+        {
+            NDalicPINVOKE.TableView_SetRelativeWidth(swigCPtr, columnIndex, widthPercentage);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a column's relative width.
+        /// </summary>
+        /// <param name="columnIndex">The column index with relative width</param>
+        /// <returns>Width in percentage units, between 0.0f and 1.0f</returns>
+        public float GetRelativeWidth(uint columnIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetRelativeWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the alignment on a cell.<br>
+        /// Cells without calling this function have the default values of LEFT and TOP respectively.<br>
+        /// </summary>
+        /// <param name="position">The cell to set alignment on</param>
+        /// <param name="horizontal">The horizontal alignment</param>
+        /// <param name="vertical">The vertical alignment</param>
+        public void SetCellAlignment(TableView.CellPosition position, HorizontalAlignmentType horizontal, VerticalAlignmentType vertical)
+        {
+            NDalicPINVOKE.TableView_SetCellAlignment(swigCPtr, TableView.CellPosition.getCPtr(position), (int)horizontal, (int)vertical);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Enumeration for describing how the size of a row / column has been set.
+        /// </summary>
+        public enum LayoutPolicy
+        {
+            Fixed,
+            Relative,
+            Fill,
+            Fit
+        }
+
+        /// <summary>
+        /// the amount of rows in the table.
+        /// </summary>
+        public int Rows
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TableView.Property.ROWS).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.ROWS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// the amount of columns in the table.
+        /// </summary>
+        public int Columns
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TableView.Property.COLUMNS).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.COLUMNS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// padding between cells.
+        /// </summary>
+        public Vector2 CellPadding
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(TableView.Property.CELL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.CELL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The number of layout rows
+        /// </summary>
+        public PropertyMap LayoutRows
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TableView.Property.LAYOUT_ROWS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.LAYOUT_ROWS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The number of layout columns
+        /// </summary>
+        public PropertyMap LayoutColumns
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TableView.Property.LAYOUT_COLUMNS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.LAYOUT_COLUMNS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
new file mode 100755 (executable)
index 0000000..13e4b4b
--- /dev/null
@@ -0,0 +1,332 @@
+/** 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.
+*
+*/
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI.BaseComponents
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// VideoView is a control for video playback and display.
+    /// </summary>
+    public class VideoView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            // By default, we do not want the position to use the anchor point
+            PositionUsesAnchorPoint = false;
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if(disposed)
+            {
+                return;
+            }
+
+            if(type == DisposeTypes.Explicit)
+            {
+                //Called by User
+                //Release your own managed resources here.
+                //You should release all of your own disposable objects here.
+            }
+
+            //Release your own unmanaged resources here.
+            //You should not access any managed member here except static instance.
+            //because the execution order of Finalizes is non-deterministic.
+
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)
+            {
+                if (swigCMemOwn)
+                {
+                    swigCMemOwn = false;
+                    NDalicPINVOKE.delete_VideoView(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+        /// <summary>
+        /// Event arguments that passed via Finished signal
+        /// </summary>
+        public class FinishedEventArgs : EventArgs
+        {
+            private VideoView _videoView;
+
+            /// <summary>
+            /// The view for video playback and display.
+            /// </summary>
+            public VideoView VideoView
+            {
+                get
+                {
+                    return _videoView;
+                }
+                set
+                {
+                    _videoView = value;
+                }
+            }
+        }
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FinishedCallbackDelegate(IntPtr data);
+        private EventHandler<FinishedEventArgs> _videoViewFinishedEventHandler;
+        private FinishedCallbackDelegate _videoViewFinishedCallbackDelegate;
+
+
+        /// <summary>
+        /// Event for Finished signal which can be used to subscribe/unsubscribe the event handler
+        /// (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.<br>
+        /// Finished signal is emitted when a video playback have finished.<br>
+        /// </summary>
+        public event EventHandler<FinishedEventArgs> Finished
+        {
+            add
+            {
+                if (_videoViewFinishedEventHandler == null)
+                {
+                    _videoViewFinishedCallbackDelegate = (OnFinished);
+                    FinishedSignal().Connect(_videoViewFinishedCallbackDelegate);
+                }
+                _videoViewFinishedEventHandler += value;
+            }
+            remove
+            {
+                _videoViewFinishedEventHandler -= value;
+                if (_videoViewFinishedEventHandler == null && FinishedSignal().Empty() == false)
+                {
+                    FinishedSignal().Disconnect(_videoViewFinishedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for VideoView Finished signal
+        private void OnFinished(IntPtr data)
+        {
+            FinishedEventArgs e = new FinishedEventArgs();
+
+            // Populate all members of "e" (FinishedEventArgs) with real data
+            e.VideoView = VideoView.GetVideoViewFromPtr(data);
+
+            if (_videoViewFinishedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _videoViewFinishedEventHandler(this, e);
+            }
+        }
+
+        internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr)
+        {
+            VideoView ret = new VideoView(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        internal class Property
+        {
+            internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();
+            internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();
+            internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();
+            internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();
+        }
+
+        /// <summary>
+        /// Creates an initialized VideoView.
+        /// </summary>
+        public VideoView() : this(NDalicPINVOKE.VideoView_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized VideoView.<br>
+        /// If the string is empty, VideoView will not display anything.<br>
+        /// </summary>
+        /// <param name="url">The url of the video resource to display</param>
+        public VideoView(string url) : this(NDalicPINVOKE.VideoView_New__SWIG_1(url), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Downcasts a handle to VideoView handle.<br>
+        /// If handle points to a VideoView, the downcast produces valid handle.<br>
+        /// If not, the returned handle is left uninitialized.<br>
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a VideoView or an uninitialized handle</returns>
+        internal new static VideoView DownCast(BaseHandle handle)
+        {
+            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Starts the video playback.
+        /// </summary>
+        public void Play()
+        {
+            NDalicPINVOKE.VideoView_Play(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Pauses the video playback.
+        /// </summary>
+        public void Pause()
+        {
+            NDalicPINVOKE.VideoView_Pause(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Stops the video playback.
+        /// </summary>
+        public void Stop()
+        {
+            NDalicPINVOKE.VideoView_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Seeks forward by the specified number of milliseconds.
+        /// </summary>
+        /// <param name="millisecond">The position for forward playback</param>
+        public void Forward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Seeks backward by the specified number of milliseconds.
+        /// </summary>
+        /// <param name="millisecond">The position for backward playback</param>
+        public void Backward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VideoViewSignal FinishedSignal()
+        {
+            VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// video file url as string type or PropertyMap.
+        /// </summary>
+        public PropertyMap Video
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VIDEO).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VIDEO, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// looping status, true or false.
+        /// </summary>
+        public bool Looping
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.LOOPING).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.LOOPING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// mute status, true or false.
+        /// </summary>
+        public bool Muted
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.MUTED).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.MUTED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// left and right volume scalar as float type, PropertyMap with two values ( "left" and "right" ).
+        /// </summary>
+        public PropertyMap Volume
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VOLUME).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VOLUME, new PropertyValue(value));
+            }
+        }
+
+    }
+
+}
index 08deb3d1efd162469223324d0426e3303d039b65..3e1ea1adb731817c238e39ffe890e7b21d71cee5 100755 (executable)
@@ -311,7 +311,7 @@ namespace Tizen.NUI.BaseComponents
         /// Event for Touched signal which can be used to subscribe/unsubscribe the event handler provided by the user.<br>
         /// Touched signal is emitted when touch input is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touched
+        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touch
         {
             add
             {
@@ -383,7 +383,7 @@ namespace Tizen.NUI.BaseComponents
         /// Event for Hovered signal which can be used to subscribe/unsubscribe the event handler provided by the user.<br>
         /// Hovered signal is emitted when hover input is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hovered
+        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hover
         {
             add
             {
@@ -455,7 +455,7 @@ namespace Tizen.NUI.BaseComponents
         /// Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler provided by the user.<br>
         /// WheelMoved signal is emitted when wheel event is received.<br>
         /// </summary>
-        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRolled
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRoll
         {
             add
             {
@@ -3532,7 +3532,120 @@ namespace Tizen.NUI.BaseComponents
             {
                 SetProperty(View.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value));
             }
+        }\r
+\r
+\r
+\r
+\r
+\r
+        /*********************************************************************************/\r
+        /*** will be removed/deprecated                                                  ***/\r
+        /*********************************************************************************/\r
+        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touched
+        {
+            add
+            {
+                if (_touchDataEventHandler == null)
+                {
+                    _touchDataCallback = OnTouch;
+                    this.TouchSignal().Connect(_touchDataCallback);
+                }
+
+                _touchDataEventHandler += value;
+            }
+
+            remove
+            {
+                _touchDataEventHandler -= value;
+
+                if (_touchDataEventHandler == null && TouchSignal().Empty() == false)
+                {
+                    this.TouchSignal().Disconnect(_touchDataCallback);
+                }
+
+            }
+        }\r
+        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hovered
+        {
+            add
+            {
+                if (_hoverEventHandler == null)
+                {
+                    _hoverEventCallback = OnHoverEvent;
+                    this.HoveredSignal().Connect(_hoverEventCallback);
+                }
+
+                _hoverEventHandler += value;
+            }
+
+            remove
+            {
+                _hoverEventHandler -= value;
+
+                if (_hoverEventHandler == null && HoveredSignal().Empty() == false)
+                {
+                    this.HoveredSignal().Disconnect(_hoverEventCallback);
+                }
+
+            }
         }
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRolled
+        {
+            add
+            {
+                if (_wheelEventHandler == null)
+                {
+                    _wheelEventCallback = OnWheelEvent;
+                    this.WheelEventSignal().Connect(_wheelEventCallback);
+                }
+
+                _wheelEventHandler += value;
+            }
+
+            remove
+            {
+                _wheelEventHandler -= value;
+
+                if (_wheelEventHandler == null && WheelEventSignal().Empty() == false)
+                {
+                    this.WheelEventSignal().Disconnect(_wheelEventCallback);
+                }
+
+            }
+        }
+        public Position AnchorPoint
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(View.Property.ANCHOR_POINT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value));
+            }
+        }\r
+\r
+        public Size Size
+        {
+            get
+            {
+                Size temp = new Size(0.0f, 0.0f, 0.0f);
+                GetProperty(View.Property.SIZE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+
+        /*********************************************************************************/\r
+        /*** will be removed/deprecated                                                  ***/\r
+        /*********************************************************************************/\r
+
     }
 
 }
diff --git a/src/Tizen.NUI/src/public/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs
deleted file mode 100755 (executable)
index 0e598d6..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-/** 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.
-*
-*/
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-using Tizen.NUI.BaseComponents;
-
-namespace Tizen.NUI
-{
-    /// <summary>
-    /// FlexContainer implements a subset of the flexbox spec (defined by W3C):https://www.w3.org/TR/css3-flexbox/<br>
-    /// It aims at providing a more efficient way to lay out, align and distribute space among items in the container, even when their size is unknown or dynamic.<br>
-    /// FlexContainer has the ability to alter the width and height of its children (i.e. flex items) to fill the available space in the best possible way on different screen sizes.<br>
-    /// FlexContainer can expand items to fill available free space, or shrink them to prevent overflow.<br>
-    /// </summary>
-    public class FlexContainer : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            // By default, we do not want the position to use the anchor point
-            PositionUsesAnchorPoint = false;
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if(disposed)
-            {
-                return;
-            }
-
-            if(type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_FlexContainer(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        internal class Property
-        {
-            internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();
-            internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();
-            internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();
-            internal static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();
-            internal static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();
-            internal static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();
-
-        }
-
-        /// <summary>
-        /// Enumeration for the instance of child properties belonging to the FlexContainer class.
-        /// </summary>
-        public class ChildProperty
-        {
-            internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();
-            internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();
-            internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();
-        }
-
-        /// <summary>
-        /// Creates a FlexContainer handle.
-        /// Calling member functions with an uninitialized handle is not allowed.
-        /// </summary>
-        public FlexContainer() : this(NDalicPINVOKE.FlexContainer_New(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-
-        internal new static FlexContainer DownCast(BaseHandle handle)
-        {
-            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Enumeration for the direction of the main axis in the flex container. This determines
-        /// the direction that flex items are laid out in the flex container.
-        /// </summary>
-        public enum FlexDirectionType
-        {
-            Column,
-            ColumnReverse,
-            Row,
-            RowReverse
-        }
-
-        /// <summary>
-        /// Enumeration for the primary direction in which content is ordered in the flex container
-        /// and on which sides the ?�start??and ?�end??are.
-        /// </summary>
-        public enum ContentDirectionType
-        {
-            Inherit,
-            LTR,
-            RTL
-        }
-
-        /// <summary>
-        /// Enumeration for the alignment of the flex items when the items do not use all available
-        /// space on the main-axis.
-        /// </summary>
-        public enum Justification
-        {
-            JustifyFlexStart,
-            JustifyCenter,
-            JustifyFlexEnd,
-            JustifySpaceBetween,
-            JustifySpaceAround
-        }
-
-        /// <summary>
-        /// Enumeration for the alignment of the flex items or lines when the items or lines do not
-        /// use all the available space on the cross-axis.
-        /// </summary>
-        public enum Alignment
-        {
-            AlignAuto,
-            AlignFlexStart,
-            AlignCenter,
-            AlignFlexEnd,
-            AlignStretch
-        }
-
-        /// <summary>
-        /// Enumeration for the wrap type of the flex container when there is no enough room for
-        /// all the items on one flex line.
-        /// </summary>
-        public enum WrapType
-        {
-            NoWrap,
-            Wrap
-        }
-
-        /// <summary>
-        /// The primary direction in which content is ordered
-        /// </summary>
-        public ContentDirectionType ContentDirection
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(out temp);
-                return (ContentDirectionType)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-        /// <summary>
-        /// The direction of the main-axis which determines the direction that flex items are laid out
-        /// </summary>
-        public FlexDirectionType FlexDirection
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(out temp);
-                return (FlexDirectionType)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-        /// <summary>
-        /// Whether the flex items should wrap or not if there is no enough room for them on one flex line
-        /// </summary>
-        public WrapType FlexWrap
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.FLEX_WRAP).Get(out temp);
-                return (WrapType)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-        /// <summary>
-        /// The alignment of flex items when the items do not use all available space on the main-axis
-        /// </summary>
-        public Justification JustifyContent
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(out temp);
-                return (Justification)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-        /// <summary>
-        /// The alignment of flex items when the items do not use all available space on the cross-axis
-        /// </summary>
-        public Alignment AlignItems
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(out temp);
-                return (Alignment)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-        /// <summary>
-        /// Similar to "alignItems", but it aligns flex lines, so only works when there are multiple lines
-        /// </summary>
-        public Alignment AlignContent
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(out temp);
-                return (Alignment)temp;
-            }
-            set
-            {
-                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue((int)value));
-            }
-        }
-
-    }
-
-}
index 8b25bcd7fe38cefd90d07bf9da1c9641614bc47a..4ce1930526c6e9b07ca0cabd155df922c390099e 100755 (executable)
@@ -1364,5 +1364,152 @@ namespace Tizen.NUI
     {
         Explicit,   //Called By User
         Implicit,   //Called by DisposeQueue
+    }\r
+\r
+\r
+\r
+\r
+    //will be removed/deprecated\r
+    public struct AnchorPoint
+    {
+        public static float Top
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointTop_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static float Bottom
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointBottom_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static float Left
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointLeft_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static float Right
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointRight_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static float Middle
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointMiddle_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position TopLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position TopCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position TopRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position CenterLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position Center
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position CenterRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position BottomLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position BottomCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+        public static Position BottomRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
     }
+
+
+
+
 }
diff --git a/src/Tizen.NUI/src/public/Scrollable.cs b/src/Tizen.NUI/src/public/Scrollable.cs
deleted file mode 100755 (executable)
index f6edecc..0000000
+++ /dev/null
@@ -1,498 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI
-{
-
-    using System;
-    using System.Runtime.InteropServices;
-    using Tizen.NUI.BaseComponents;
-
-    public class Scrollable : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            // By default, we do not want the position to use the anchor point
-            PositionUsesAnchorPoint = false;
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Scrollable obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if (disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            //Unreference this from if a static instance refer to this.
-            ViewRegistry.UnregisterView(this);
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_Scrollable(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-        public class StartedEventArgs : EventArgs
-        {
-            private Vector2 _vector2;
-
-            public Vector2 Vector2
-            {
-                get
-                {
-                    return _vector2;
-                }
-                set
-                {
-                    _vector2 = value;
-                }
-            }
-        }
-
-        public class UpdatedEventArgs : EventArgs
-        {
-            private Vector2 _vector2;
-
-            public Vector2 Vector2
-            {
-                get
-                {
-                    return _vector2;
-                }
-                set
-                {
-                    _vector2 = value;
-                }
-            }
-        }
-
-        public class CompletedEventArgs : EventArgs
-        {
-            private Vector2 _vector2;
-
-            public Vector2 Vector2
-            {
-                get
-                {
-                    return _vector2;
-                }
-                set
-                {
-                    _vector2 = value;
-                }
-            }
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void StartedCallbackDelegate(IntPtr vector2);
-        private DaliEventHandler<object, StartedEventArgs> _scrollableStartedEventHandler;
-        private StartedCallbackDelegate _scrollableStartedCallbackDelegate;
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void UpdatedCallbackDelegate(IntPtr vector2);
-        private DaliEventHandler<object, UpdatedEventArgs> _scrollableUpdatedEventHandler;
-        private UpdatedCallbackDelegate _scrollableUpdatedCallbackDelegate;
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void CompletedCallbackDelegate(IntPtr vector2);
-        private DaliEventHandler<object, CompletedEventArgs> _scrollableCompletedEventHandler;
-        private CompletedCallbackDelegate _scrollableCompletedCallbackDelegate;
-
-        public event DaliEventHandler<object, StartedEventArgs> ScrollStarted
-        {
-            add
-            {
-                lock (this)
-                {
-                    // Restricted to only one listener
-                    if (_scrollableStartedEventHandler == null)
-                    {
-                        _scrollableStartedEventHandler += value;
-
-                        _scrollableStartedCallbackDelegate = new StartedCallbackDelegate(OnStarted);
-                        this.ScrollStartedSignal().Connect(_scrollableStartedCallbackDelegate);
-                    }
-                }
-            }
-
-            remove
-            {
-                lock (this)
-                {
-                    if (_scrollableStartedEventHandler != null)
-                    {
-                        this.ScrollStartedSignal().Disconnect(_scrollableStartedCallbackDelegate);
-                    }
-
-                    _scrollableStartedEventHandler -= value;
-                }
-            }
-        }
-
-        private void OnStarted(IntPtr vector2)
-        {
-            StartedEventArgs e = new StartedEventArgs();
-
-            // Populate all members of "e" (StartedEventArgs) with real data
-            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
-
-            if (_scrollableStartedEventHandler != null)
-            {
-                //here we send all data to user event handlers
-                _scrollableStartedEventHandler(this, e);
-            }
-
-        }
-
-        public event DaliEventHandler<object, UpdatedEventArgs> ScrollUpdated
-        {
-            add
-            {
-                lock (this)
-                {
-                    // Restricted to only one listener
-                    if (_scrollableUpdatedEventHandler == null)
-                    {
-                        _scrollableUpdatedEventHandler += value;
-
-                        _scrollableUpdatedCallbackDelegate = new UpdatedCallbackDelegate(OnUpdated);
-                        this.ScrollUpdatedSignal().Connect(_scrollableUpdatedCallbackDelegate);
-                    }
-                }
-            }
-
-            remove
-            {
-                lock (this)
-                {
-                    if (_scrollableUpdatedEventHandler != null)
-                    {
-                        this.ScrollUpdatedSignal().Disconnect(_scrollableUpdatedCallbackDelegate);
-                    }
-
-                    _scrollableUpdatedEventHandler -= value;
-                }
-            }
-        }
-
-        private void OnUpdated(IntPtr vector2)
-        {
-            UpdatedEventArgs e = new UpdatedEventArgs();
-
-            // Populate all members of "e" (UpdatedEventArgs) with real data
-            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
-
-            if (_scrollableUpdatedEventHandler != null)
-            {
-                //here we send all data to user event handlers
-                _scrollableUpdatedEventHandler(this, e);
-            }
-
-        }
-
-        public event DaliEventHandler<object, CompletedEventArgs> ScrollCompleted
-        {
-            add
-            {
-                lock (this)
-                {
-                    // Restricted to only one listener
-                    if (_scrollableCompletedEventHandler == null)
-                    {
-                        _scrollableCompletedEventHandler += value;
-
-                        _scrollableCompletedCallbackDelegate = new CompletedCallbackDelegate(OnCompleted);
-                        this.ScrollCompletedSignal().Connect(_scrollableCompletedCallbackDelegate);
-                    }
-                }
-            }
-
-            remove
-            {
-                lock (this)
-                {
-                    if (_scrollableCompletedEventHandler != null)
-                    {
-                        this.ScrollCompletedSignal().Disconnect(_scrollableCompletedCallbackDelegate);
-                    }
-
-                    _scrollableCompletedEventHandler -= value;
-                }
-            }
-        }
-
-        private void OnCompleted(IntPtr vector2)
-        {
-            CompletedEventArgs e = new CompletedEventArgs();
-
-            // Populate all members of "e" (CompletedEventArgs) with real data
-            e.Vector2 = Tizen.NUI.Vector2.GetVector2FromPtr(vector2);
-
-            if (_scrollableCompletedEventHandler != null)
-            {
-                //here we send all data to user event handlers
-                _scrollableCompletedEventHandler(this, e);
-            }
-
-        }
-
-
-        public class Property
-        {
-            public static readonly int OVERSHOOT_EFFECT_COLOR = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get();
-            public static readonly int OVERSHOOT_ANIMATION_SPEED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get();
-            public static readonly int OVERSHOOT_ENABLED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ENABLED_get();
-            public static readonly int OVERSHOOT_SIZE = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_SIZE_get();
-            public static readonly int SCROLL_TO_ALPHA_FUNCTION = NDalicPINVOKE.Scrollable_Property_SCROLL_TO_ALPHA_FUNCTION_get();
-            public static readonly int SCROLL_RELATIVE_POSITION = NDalicPINVOKE.Scrollable_Property_SCROLL_RELATIVE_POSITION_get();
-            public static readonly int SCROLL_POSITION_MIN = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_get();
-            public static readonly int SCROLL_POSITION_MIN_X = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_X_get();
-            public static readonly int SCROLL_POSITION_MIN_Y = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MIN_Y_get();
-            public static readonly int SCROLL_POSITION_MAX = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_get();
-            public static readonly int SCROLL_POSITION_MAX_X = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_X_get();
-            public static readonly int SCROLL_POSITION_MAX_Y = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_Y_get();
-            public static readonly int CAN_SCROLL_VERTICAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_VERTICAL_get();
-            public static readonly int CAN_SCROLL_HORIZONTAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_HORIZONTAL_get();
-
-        }
-
-        public Scrollable() : this(NDalicPINVOKE.new_Scrollable__SWIG_0(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal new static Scrollable DownCast(BaseHandle handle)
-        {
-            Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        private bool IsOvershootEnabled()
-        {
-            bool ret = NDalicPINVOKE.Scrollable_IsOvershootEnabled(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        private void SetOvershootEnabled(bool enable)
-        {
-            NDalicPINVOKE.Scrollable_SetOvershootEnabled(swigCPtr, enable);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        private void SetOvershootEffectColor(Vector4 color)
-        {
-            NDalicPINVOKE.Scrollable_SetOvershootEffectColor(swigCPtr, Vector4.getCPtr(color));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        private Vector4 GetOvershootEffectColor()
-        {
-            Vector4 ret = new Vector4(NDalicPINVOKE.Scrollable_GetOvershootEffectColor(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        private void SetOvershootAnimationSpeed(float pixelsPerSecond)
-        {
-            NDalicPINVOKE.Scrollable_SetOvershootAnimationSpeed(swigCPtr, pixelsPerSecond);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        private float GetOvershootAnimationSpeed()
-        {
-            float ret = NDalicPINVOKE.Scrollable_GetOvershootAnimationSpeed(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal ScrollableSignal ScrollStartedSignal()
-        {
-            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollStartedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal ScrollableSignal ScrollUpdatedSignal()
-        {
-            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollUpdatedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal ScrollableSignal ScrollCompletedSignal()
-        {
-            ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollCompletedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public Vector4 OvershootEffectColor
-        {
-            get
-            {
-                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-                GetProperty(Scrollable.Property.OVERSHOOT_EFFECT_COLOR).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.OVERSHOOT_EFFECT_COLOR, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public float OvershootAnimationSpeed
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public bool OvershootEnabled
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Scrollable.Property.OVERSHOOT_ENABLED).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.OVERSHOOT_ENABLED, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public Vector2 OvershootSize
-        {
-            get
-            {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(Scrollable.Property.OVERSHOOT_SIZE).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.OVERSHOOT_SIZE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public int ScrollToAlphaFunction
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public Vector2 ScrollRelativePosition
-        {
-            get
-            {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(Scrollable.Property.SCROLL_RELATIVE_POSITION).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.SCROLL_RELATIVE_POSITION, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public Vector2 ScrollPositionMin
-        {
-            get
-            {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(Scrollable.Property.SCROLL_POSITION_MIN).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.SCROLL_POSITION_MIN, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public Vector2 ScrollPositionMax
-        {
-            get
-            {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(Scrollable.Property.SCROLL_POSITION_MAX).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.SCROLL_POSITION_MAX, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public bool CanScrollVertical
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        public bool CanScrollHorizontal
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs
deleted file mode 100755 (executable)
index 01a94ea..0000000
+++ /dev/null
@@ -1,721 +0,0 @@
-/** 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.
-*
-*/
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-using Tizen.NUI.BaseComponents;
-
-namespace Tizen.NUI
-{
-    using Tizen.NUI.BaseComponents;
-    /// <summary>
-    /// TableView is a layout container for aligning child actors in a grid like layout.<br>
-    /// TableView constrains the x and y position and width and height of the child actors.<br>
-    /// z position and depth are left intact so that 3D model actors can also be laid out
-    /// in a grid without loosing their depth scaling.<br>
-    /// </summary>
-    public class TableView : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal TableView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TableView_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            // By default, we do not want the position to use the anchor point
-            PositionUsesAnchorPoint = false;
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TableView obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if(disposed)
-            {
-                return;
-            }
-
-            if(type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_TableView(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        internal class Property
-        {
-            internal static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get();
-            internal static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get();
-            internal static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get();
-            internal static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get();
-            internal static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get();
-        }
-
-        internal class ChildProperty
-        {
-            internal static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get();
-            internal static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get();
-            internal static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get();
-            internal static readonly int CELL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get();
-            internal static readonly int CELL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get();
-        }
-
-        /// <summary>
-        /// Class to specify layout position for child view.
-        /// </summary>
-        public class CellPosition : global::System.IDisposable
-        {
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-            protected bool swigCMemOwn;
-
-            internal CellPosition(global::System.IntPtr cPtr, bool cMemoryOwn)
-            {
-                swigCMemOwn = cMemoryOwn;
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            }
-
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CellPosition obj)
-            {
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-            }
-
-            //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) 
-
-            //A Flag to check who called Dispose(). (By User or DisposeQueue)
-            private bool isDisposeQueued = false;
-            //A Flat to check if it is already disposed.
-            protected bool disposed = false;
-
-            ~CellPosition()
-            {
-                if(!isDisposeQueued)
-                {
-                    isDisposeQueued = true;
-                    DisposeQueue.Instance.Add(this);
-                }
-            }
-
-            public void Dispose()
-            {
-                //Throw excpetion if Dispose() is called in separate thread.
-                if (!Window.IsInstalled())
-                {
-                    throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");
-                }
-
-                if (isDisposeQueued)
-                {
-                    Dispose(DisposeTypes.Implicit);
-                }
-                else
-                {
-                    Dispose(DisposeTypes.Explicit);
-                    System.GC.SuppressFinalize(this);
-                }
-            }
-
-            protected virtual void Dispose(DisposeTypes type)
-            {
-                if (disposed)
-                {
-                    return;
-                }
-
-                if(type == DisposeTypes.Explicit)
-                {
-                    //Called by User
-                    //Release your own managed resources here.
-                    //You should release all of your own disposable objects here.
-                }
-
-                //Release your own unmanaged resources here.
-                //You should not access any managed member here except static instance.
-                //because the execution order of Finalizes is non-deterministic.
-
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)
-                {
-                    if (swigCMemOwn)
-                    {
-                        swigCMemOwn = false;
-                        NDalicPINVOKE.delete_TableView_CellPosition(swigCPtr);
-                    }
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-                }
-                disposed = true;
-            }
-
-            /// <summary>
-            /// Constructor.
-            /// </summary>
-            /// <param name="rowIndex">The row index initialized</param>
-            /// <param name="columnIndex">The column index initialized</param>
-            /// <param name="rowSpan">The row span initialized</param>
-            /// <param name="columnSpan">The column span initialized</param>
-            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan, uint columnSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_0(rowIndex, columnIndex, rowSpan, columnSpan), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            /// <summary>
-            /// Constructor to initialise values to defaults for convenience.
-            /// </summary>
-            /// <param name="rowIndex">The row index initialized</param>
-            /// <param name="columnIndex">The column index initialized</param>
-            /// <param name="rowSpan">The row span initialized</param>
-            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_1(rowIndex, columnIndex, rowSpan), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            /// <summary>
-            /// Constructor to initialise values to defaults for convenience.
-            /// </summary>
-            /// <param name="rowIndex">The row index initialized</param>
-            /// <param name="columnIndex">The column index initialized</param>
-            public CellPosition(uint rowIndex, uint columnIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_2(rowIndex, columnIndex), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            /// <summary>
-            /// Constructor to initialise values to defaults for convenience.
-            /// </summary>
-            /// <param name="rowIndex">The row index initialized</param>
-            public CellPosition(uint rowIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_3(rowIndex), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            /// <summary>
-            /// Default constructor
-            /// </summary>
-            public CellPosition() : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_4(), true)
-            {
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-
-            /// <summary>
-            /// Index of row
-            /// </summary>
-            public uint rowIndex
-            {
-                set
-                {
-                    NDalicPINVOKE.TableView_CellPosition_rowIndex_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowIndex_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// Index of column
-            /// </summary>
-            public uint columnIndex
-            {
-                set
-                {
-                    NDalicPINVOKE.TableView_CellPosition_columnIndex_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnIndex_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// Span of row
-            /// </summary>
-            public uint rowSpan
-            {
-                set
-                {
-                    NDalicPINVOKE.TableView_CellPosition_rowSpan_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowSpan_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// Span of column
-            /// </summary>
-            public uint columnSpan
-            {
-                set
-                {
-                    NDalicPINVOKE.TableView_CellPosition_columnSpan_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnSpan_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-        }
-
-        /// <summary>
-        /// Creates the TableView view.
-        /// </summary>
-        /// <param name="initialRows">initialRows for the table</param>
-        /// <param name="initialColumns">initialColumns for the table</param>
-        public TableView(uint initialRows, uint initialColumns) : this(NDalicPINVOKE.TableView_New(initialRows, initialColumns), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-
-        /// <summary>
-        /// Copy constructor. Creates another handle that points to the same real object.
-        /// </summary>
-        /// <param name="handle">Handle to copy from</param>
-        public TableView(TableView handle) : this(NDalicPINVOKE.new_TableView__SWIG_1(TableView.getCPtr(handle)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Downcasts a handle to TableView handle.<br>
-        /// If handle points to a TableView, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
-        /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a TableView or an uninitialized handle</returns>
-        internal new static TableView DownCast(BaseHandle handle)
-        {
-            TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Adds a child to the table.<br>
-        /// If the row or column index is outside the table, the table gets resized bigger.<br>
-        /// </summary>
-        /// <param name="child">The child to add</param>
-        /// <param name="position">The position for the child</param>
-        /// <returns>Tue if the addition succeeded and false if the cell is already occupied</returns>
-        public bool AddChild(View child, TableView.CellPosition position)
-        {
-            bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Returns a child from the given layout position.
-        /// </summary>
-        /// <param name="position">The position in the table</param>
-        /// <returns>Child that was in the cell or an uninitialized handle</returns>
-        public View GetChildAt(TableView.CellPosition position)
-        {
-            View ret = new View(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Removes a child from the given layout position.
-        /// </summary>
-        /// <param name="position">The position for the child to remove</param>
-        /// <returns>Child that was removed or an uninitialized handle</returns>
-        public View RemoveChildAt(TableView.CellPosition position)
-        {
-            View ret = new View(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Finds the child's layout position.
-        /// </summary>
-        /// <param name="child">The child to search for</param>
-        /// <param name="position">The position for the child</param>
-        /// <returns>true if the child was included in this TableView</returns>
-        public bool FindChildPosition(View child, TableView.CellPosition position)
-        {
-            bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Inserts a new row to given index.
-        /// </summary>
-        /// <param name="rowIndex">The rowIndex of the new row</param>
-        public void InsertRow(uint rowIndex)
-        {
-            NDalicPINVOKE.TableView_InsertRow(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Deletes a row from the given index.<br>
-        /// Removed elements are deleted.<br>
-        /// </summary>
-        /// <param name="rowIndex">The rowIndex of the row to delete</param>
-        public void DeleteRow(uint rowIndex)
-        {
-            NDalicPINVOKE.TableView_DeleteRow__SWIG_0(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Inserts a new column to the given index.
-        /// </summary>
-        /// <param name="columnIndex">The columnIndex of the new column</param>
-        public void InsertColumn(uint columnIndex)
-        {
-            NDalicPINVOKE.TableView_InsertColumn(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Deletes a column from the given index.<br>
-        /// Removed elements are deleted.<br>
-        /// </summary>
-        /// <param name="columnIndex">The columnIndex of the column to delete</param>
-        public void DeleteColumn(uint columnIndex)
-        {
-            NDalicPINVOKE.TableView_DeleteColumn__SWIG_0(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Resizes the TableView.
-        /// </summary>
-        /// <param name="rows">The rows for the table</param>
-        /// <param name="columns">The columns for the table</param>
-        public void Resize(uint rows, uint columns)
-        {
-            NDalicPINVOKE.TableView_Resize__SWIG_0(swigCPtr, rows, columns);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Sets horizontal and vertical padding between cells.
-        /// </summary>
-        /// <param name="padding">Width and height</param>
-        public void SetCellPadding(Size2D padding)
-        {
-            NDalicPINVOKE.TableView_SetCellPadding(swigCPtr, Size2D.getCPtr(padding));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets the current padding as width and height.
-        /// </summary>
-        /// <returns>The current padding as width and height</returns>
-        public Vector2 GetCellPadding()
-        {
-            Vector2 ret = new Vector2(NDalicPINVOKE.TableView_GetCellPadding(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Specifies this row as fitting its height to its children.
-        /// </summary>
-        /// <param name="rowIndex">The row to set</param>
-        public void SetFitHeight(uint rowIndex)
-        {
-            NDalicPINVOKE.TableView_SetFitHeight(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Checks if the row is a fit row.
-        /// </summary>
-        /// <param name="rowIndex">The row to check</param>
-        /// <returns>true if the row is fit</returns>
-        public bool IsFitHeight(uint rowIndex)
-        {
-            bool ret = NDalicPINVOKE.TableView_IsFitHeight(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Specifies this column as fitting its width to its children.
-        /// </summary>
-        /// <param name="columnIndex">The column to set</param>
-        public void SetFitWidth(uint columnIndex)
-        {
-            NDalicPINVOKE.TableView_SetFitWidth(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Checks if the column is a fit column.
-        /// </summary>
-        /// <param name="columnIndex">The column to check</param>
-        /// <returns>true if the column is fit</returns>
-        public bool IsFitWidth(uint columnIndex)
-        {
-            bool ret = NDalicPINVOKE.TableView_IsFitWidth(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Sets a row to have fixed height.<br>
-        /// Setting a fixed height of 0 has no effect.<br>
-        /// </summary>
-        /// <param name="rowIndex">The rowIndex for row with fixed height</param>
-        /// <param name="height">The height in world coordinate units</param>
-        public void SetFixedHeight(uint rowIndex, float height)
-        {
-            NDalicPINVOKE.TableView_SetFixedHeight(swigCPtr, rowIndex, height);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets a row's fixed height.
-        /// </summary>
-        /// <param name="rowIndex">The row index with fixed height</param>
-        /// <returns>height The height in world coordinate units</returns>
-        public float GetFixedHeight(uint rowIndex)
-        {
-            float ret = NDalicPINVOKE.TableView_GetFixedHeight(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Sets a row to have relative height. Relative height means percentage of
-        /// the remainder of the table height after subtracting Padding and Fixed height rows.<br>
-        /// Setting a relative height of 0 has no effect.<br>
-        /// </summary>
-        /// <param name="rowIndex">The rowIndex for row with relative height</param>
-        /// <param name="heightPercentage">The height percentage between 0.0f and 1.0f</param>
-        public void SetRelativeHeight(uint rowIndex, float heightPercentage)
-        {
-            NDalicPINVOKE.TableView_SetRelativeHeight(swigCPtr, rowIndex, heightPercentage);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets a row's relative height.
-        /// </summary>
-        /// <param name="rowIndex">The row index with relative height</param>
-        /// <returns>Height in percentage units, between 0.0f and 1.0f</returns>
-        public float GetRelativeHeight(uint rowIndex)
-        {
-            float ret = NDalicPINVOKE.TableView_GetRelativeHeight(swigCPtr, rowIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Sets a column to have fixed width.<br>
-        /// Setting a fixed width of 0 has no effect.<br>
-        /// </summary>
-        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
-        /// <param name="width">The width in world coordinate units</param>
-        public void SetFixedWidth(uint columnIndex, float width)
-        {
-            NDalicPINVOKE.TableView_SetFixedWidth(swigCPtr, columnIndex, width);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets a column's fixed width.
-        /// </summary>
-        /// <param name="columnIndex">The column index with fixed width</param>
-        /// <returns>Width in world coordinate units</returns>
-        public float GetFixedWidth(uint columnIndex)
-        {
-            float ret = NDalicPINVOKE.TableView_GetFixedWidth(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Sets a column to have relative width. Relative width means percentage of
-        /// the remainder of table width after subtracting Padding and Fixed width columns.<br>
-        /// Setting a relative width of 0 has no effect.<br>
-        /// </summary>
-        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
-        /// <param name="widthPercentage">The widthPercentage between 0.0f and 1.0f</param>
-        public void SetRelativeWidth(uint columnIndex, float widthPercentage)
-        {
-            NDalicPINVOKE.TableView_SetRelativeWidth(swigCPtr, columnIndex, widthPercentage);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets a column's relative width.
-        /// </summary>
-        /// <param name="columnIndex">The column index with relative width</param>
-        /// <returns>Width in percentage units, between 0.0f and 1.0f</returns>
-        public float GetRelativeWidth(uint columnIndex)
-        {
-            float ret = NDalicPINVOKE.TableView_GetRelativeWidth(swigCPtr, columnIndex);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Sets the alignment on a cell.<br>
-        /// Cells without calling this function have the default values of LEFT and TOP respectively.<br>
-        /// </summary>
-        /// <param name="position">The cell to set alignment on</param>
-        /// <param name="horizontal">The horizontal alignment</param>
-        /// <param name="vertical">The vertical alignment</param>
-        public void SetCellAlignment(TableView.CellPosition position, HorizontalAlignmentType horizontal, VerticalAlignmentType vertical)
-        {
-            NDalicPINVOKE.TableView_SetCellAlignment(swigCPtr, TableView.CellPosition.getCPtr(position), (int)horizontal, (int)vertical);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Enumeration for describing how the size of a row / column has been set.
-        /// </summary>
-        public enum LayoutPolicy
-        {
-            Fixed,
-            Relative,
-            Fill,
-            Fit
-        }
-
-        /// <summary>
-        /// the amount of rows in the table.
-        /// </summary>
-        public int Rows
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(TableView.Property.ROWS).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(TableView.Property.ROWS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// the amount of columns in the table.
-        /// </summary>
-        public int Columns
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(TableView.Property.COLUMNS).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(TableView.Property.COLUMNS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// padding between cells.
-        /// </summary>
-        public Vector2 CellPadding
-        {
-            get
-            {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(TableView.Property.CELL_PADDING).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(TableView.Property.CELL_PADDING, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// The number of layout rows
-        /// </summary>
-        public PropertyMap LayoutRows
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TableView.Property.LAYOUT_ROWS).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(TableView.Property.LAYOUT_ROWS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// The number of layout columns
-        /// </summary>
-        public PropertyMap LayoutColumns
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TableView.Property.LAYOUT_COLUMNS).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(TableView.Property.LAYOUT_COLUMNS, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-    }
-}
diff --git a/src/Tizen.NUI/src/public/UIComponents/Slider.cs b/src/Tizen.NUI/src/public/UIComponents/Slider.cs
new file mode 100755 (executable)
index 0000000..ff7b0fd
--- /dev/null
@@ -0,0 +1,775 @@
+/** 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.
+*
+*/
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI.UIComponents
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+    using Tizen.NUI.BaseComponents;
+
+    /// <summary>
+    /// Slider is a control to enable sliding an indicator between two values.
+    /// </summary>
+    public class Slider : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            // By default, we do not want the position to use the anchor point
+            PositionUsesAnchorPoint = false;
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Slider obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                //Called by User
+                //Release your own managed resources here.
+                //You should release all of your own disposable objects here.
+
+            }
+
+            //Release your own unmanaged resources here.
+            //You should not access any managed member here except static instance.
+            //because the execution order of Finalizes is non-deterministic.
+
+            //Unreference this from if a static instance refer to this.
+            ViewRegistry.UnregisterView(this);
+
+            if (swigCPtr.Handle != global::System.IntPtr.Zero)
+            {
+                if (swigCMemOwn)
+                {
+                    swigCMemOwn = false;
+                    NDalicPINVOKE.delete_Slider(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+        /// <summary>
+        /// Value changed event arguments.
+        /// </summary>
+        public class ValueChangedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private float _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public float SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sliding finished event arguments.
+        /// </summary>
+        public class SlidingFinishedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private float _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public float SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Mark reached event arguments.
+        /// </summary>
+        public class MarkReachedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private int _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public int SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
+        }
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool ValueChangedCallbackDelegate(IntPtr slider, float slideValue);
+        private EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> _sliderValueChangedEventHandler;
+        private ValueChangedCallbackDelegate _sliderValueChangedCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool SlidingFinishedCallbackDelegate(IntPtr slider, float slideValue);
+        private EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> _sliderSlidingFinishedEventHandler;
+        private SlidingFinishedCallbackDelegate _sliderSlidingFinishedCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool MarkReachedCallbackDelegate(IntPtr slider, int slideValue);
+        private EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> _sliderMarkReachedEventHandler;
+        private MarkReachedCallbackDelegate _sliderMarkReachedCallbackDelegate;
+
+        /// <summary>
+        /// Event emitted when the slider value changes.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> ValueChanged
+        {
+            add
+            {
+                if (_sliderValueChangedEventHandler == null)
+                {
+                    _sliderValueChangedCallbackDelegate = (OnValueChanged);
+                    ValueChangedSignal().Connect(_sliderValueChangedCallbackDelegate);
+                }
+                _sliderValueChangedEventHandler += value;
+            }
+            remove
+            {
+                _sliderValueChangedEventHandler -= value;
+                if (_sliderValueChangedEventHandler == null && ValueChangedSignal().Empty() == false)
+                {
+                    ValueChangedSignal().Disconnect(_sliderValueChangedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Slider ValueChanged signal
+        private bool OnValueChanged(IntPtr slider, float slideValue)
+        {
+            ValueChangedEventArgs e = new ValueChangedEventArgs();
+
+            // Populate all members of "e" (ValueChangedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderValueChangedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderValueChangedEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Event emitted when the sliding is finished.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> SlidingFinished
+        {
+            add
+            {
+                if (_sliderSlidingFinishedEventHandler == null)
+                {
+                    _sliderSlidingFinishedCallbackDelegate = (OnSlidingFinished);
+                    SlidingFinishedSignal().Connect(_sliderSlidingFinishedCallbackDelegate);
+                }
+                _sliderSlidingFinishedEventHandler += value;
+            }
+            remove
+            {
+                _sliderSlidingFinishedEventHandler -= value;
+                if (_sliderSlidingFinishedEventHandler == null && SlidingFinishedSignal().Empty() == false)
+                {
+                    SlidingFinishedSignal().Disconnect(_sliderSlidingFinishedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Slider SlidingFinished signal
+        private bool OnSlidingFinished(IntPtr slider, float slideValue)
+        {
+            SlidingFinishedEventArgs e = new SlidingFinishedEventArgs();
+
+            // Populate all members of "e" (SlidingFinishedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderSlidingFinishedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderSlidingFinishedEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Event emitted when the slider handle reaches a mark.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> MarkReached
+        {
+            add
+            {
+                if (_sliderMarkReachedEventHandler == null)
+                {
+                    _sliderMarkReachedCallbackDelegate = (OnMarkReached);
+                    MarkReachedSignal().Connect(_sliderMarkReachedCallbackDelegate);
+                }
+                _sliderMarkReachedEventHandler += value;
+            }
+            remove
+            {
+                _sliderMarkReachedEventHandler -= value;
+                if (_sliderMarkReachedEventHandler == null && MarkReachedSignal().Empty() == false)
+                {
+                    MarkReachedSignal().Disconnect(_sliderMarkReachedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Slider MarkReached signal
+        private bool OnMarkReached(IntPtr slider, int slideValue)
+        {
+            MarkReachedEventArgs e = new MarkReachedEventArgs();
+
+            // Populate all members of "e" (MarkReachedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderMarkReachedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderMarkReachedEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Get Slider from the pointer.
+        /// </summary>
+        /// <param name="cPtr">The pointer of Slider</param>
+        /// <returns>Object of Slider type</returns>
+        internal static Slider GetSliderFromPtr(global::System.IntPtr cPtr)
+        {
+            Slider ret = new Slider(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }\r
+\r
+            //A Flag to check who called Dispose(). (By User or DisposeQueue)\r
+            private bool isDisposeQueued = false;\r
+            //A Flat to check if it is already disposed.\r
+            protected bool disposed = false;
+
+            ~Property()\r
+            {\r
+                if (!isDisposeQueued)\r
+                {\r
+                    isDisposeQueued = true;\r
+                    DisposeQueue.Instance.Add(this);\r
+                }\r
+            }\r
+\r
+            public void Dispose()\r
+            {\r
+                //Throw excpetion if Dispose() is called in separate thread.\r
+                if (!Window.IsInstalled())\r
+                {\r
+                    throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");\r
+                }\r
+\r
+                if (isDisposeQueued)\r
+                {\r
+                    Dispose(DisposeTypes.Implicit);\r
+                }\r
+                else\r
+                {\r
+                    Dispose(DisposeTypes.Explicit);\r
+                    System.GC.SuppressFinalize(this);\r
+                }\r
+            }\r
+\r
+            protected virtual void Dispose(DisposeTypes type)\r
+            {\r
+                if (disposed)\r
+                {\r
+                    return;\r
+                }\r
+\r
+                if (type == DisposeTypes.Explicit)\r
+                {\r
+                    //Called by User\r
+                    //Release your own managed resources here.\r
+                    //You should release all of your own disposable objects here.\r
+\r
+                }\r
+\r
+                //Release your own unmanaged resources here.\r
+                //You should not access any managed member here except static instance.\r
+                //because the execution order of Finalizes is non-deterministic.\r
+\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_Slider_Property(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+\r
+                disposed = true;\r
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_Slider_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int LOWER_BOUND = NDalicPINVOKE.Slider_Property_LOWER_BOUND_get();
+            internal static readonly int UPPER_BOUND = NDalicPINVOKE.Slider_Property_UPPER_BOUND_get();
+            internal static readonly int VALUE = NDalicPINVOKE.Slider_Property_VALUE_get();
+            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.Slider_Property_TRACK_VISUAL_get();
+            internal static readonly int HANDLE_VISUAL = NDalicPINVOKE.Slider_Property_HANDLE_VISUAL_get();
+            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.Slider_Property_PROGRESS_VISUAL_get();
+            internal static readonly int POPUP_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_VISUAL_get();
+            internal static readonly int POPUP_ARROW_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_ARROW_VISUAL_get();
+            internal static readonly int DISABLED_COLOR = NDalicPINVOKE.Slider_Property_DISABLED_COLOR_get();
+            internal static readonly int VALUE_PRECISION = NDalicPINVOKE.Slider_Property_VALUE_PRECISION_get();
+            internal static readonly int SHOW_POPUP = NDalicPINVOKE.Slider_Property_SHOW_POPUP_get();
+            internal static readonly int SHOW_VALUE = NDalicPINVOKE.Slider_Property_SHOW_VALUE_get();
+            internal static readonly int MARKS = NDalicPINVOKE.Slider_Property_MARKS_get();
+            internal static readonly int SNAP_TO_MARKS = NDalicPINVOKE.Slider_Property_SNAP_TO_MARKS_get();
+            internal static readonly int MARK_TOLERANCE = NDalicPINVOKE.Slider_Property_MARK_TOLERANCE_get();
+
+        }
+
+        /// <summary>
+        /// Creates the Slider control.
+        /// </summary>
+        public Slider() : this(NDalicPINVOKE.Slider_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal Slider(Slider handle) : this(NDalicPINVOKE.new_Slider__SWIG_1(Slider.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Slider Assign(Slider handle)
+        {
+            Slider ret = new Slider(NDalicPINVOKE.Slider_Assign(swigCPtr, Slider.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts an Object handle to Slider.<br>
+        /// If handle points to a Slider, the downcast produces valid handle.<br>
+        /// If not, the returned handle is left uninitialized.<br>
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a Slider or an uninitialized handle</returns>
+        public new static Slider DownCast(BaseHandle handle)
+        {
+            Slider ret = new Slider(NDalicPINVOKE.Slider_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderValueChangedSignal ValueChangedSignal()
+        {
+            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_ValueChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderValueChangedSignal SlidingFinishedSignal()
+        {
+            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_SlidingFinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderMarkReachedSignal MarkReachedSignal()
+        {
+            SliderMarkReachedSignal ret = new SliderMarkReachedSignal(NDalicPINVOKE.Slider_MarkReachedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Lower bound property
+        /// </summary>
+        public float LowerBound
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.LOWER_BOUND).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.LOWER_BOUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Upper bound property
+        /// </summary>
+        public float UpperBound
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.UPPER_BOUND).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.UPPER_BOUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Value property
+        /// </summary>
+        public float Value
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.VALUE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Track visual property
+        /// </summary>
+        public PropertyMap TrackVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.TRACK_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Handle visual property
+        /// </summary>
+        public PropertyMap HandleVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.HANDLE_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.HANDLE_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Progress visual property
+        /// </summary>
+        public PropertyMap ProgressVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Popup visual property
+        /// </summary>
+        public PropertyMap PopupVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.POPUP_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.POPUP_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Popup arrow visual property
+        /// </summary>
+        public PropertyMap PopupArrowVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.POPUP_ARROW_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.POPUP_ARROW_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Disable color property
+        /// </summary>
+        public Vector4 DisabledColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Slider.Property.DISABLED_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.DISABLED_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Value presicion property
+        /// </summary>
+        public int ValuePrecision
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(Slider.Property.VALUE_PRECISION).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.VALUE_PRECISION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Show popup property
+        /// </summary>
+        public bool ShowPopup
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SHOW_POPUP).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SHOW_POPUP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Show value property
+        /// </summary>
+        public bool ShowValue
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SHOW_VALUE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SHOW_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Marks property
+        /// </summary>
+        public Tizen.NUI.PropertyArray Marks
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(Slider.Property.MARKS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.MARKS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Snap to marks property
+        /// </summary>
+        public bool SnapToMarks
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SNAP_TO_MARKS).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SNAP_TO_MARKS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Mark tolerance property
+        /// </summary>
+        public float MarkTolerance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.MARK_TOLERANCE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.MARK_TOLERANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+}
diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs
deleted file mode 100755 (executable)
index af52689..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-/** 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.
-*
-*/
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI
-{
-
-    using System;
-    using System.Runtime.InteropServices;
-    using Tizen.NUI.BaseComponents;
-
-    /// <summary>
-    /// VideoView is a control for video playback and display.
-    /// </summary>
-    public class VideoView : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            // By default, we do not want the position to use the anchor point
-            PositionUsesAnchorPoint = false;
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if(disposed)
-            {
-                return;
-            }
-
-            if(type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicPINVOKE.delete_VideoView(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-        /// <summary>
-        /// Event arguments that passed via Finished signal
-        /// </summary>
-        public class FinishedEventArgs : EventArgs
-        {
-            private VideoView _videoView;
-
-            /// <summary>
-            /// The view for video playback and display.
-            /// </summary>
-            public VideoView VideoView
-            {
-                get
-                {
-                    return _videoView;
-                }
-                set
-                {
-                    _videoView = value;
-                }
-            }
-        }
-
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void FinishedCallbackDelegate(IntPtr data);
-        private EventHandler<FinishedEventArgs> _videoViewFinishedEventHandler;
-        private FinishedCallbackDelegate _videoViewFinishedCallbackDelegate;
-
-
-        /// <summary>
-        /// Event for Finished signal which can be used to subscribe/unsubscribe the event handler
-        /// (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.<br>
-        /// Finished signal is emitted when a video playback have finished.<br>
-        /// </summary>
-        public event EventHandler<FinishedEventArgs> Finished
-        {
-            add
-            {
-                if (_videoViewFinishedEventHandler == null)
-                {
-                    _videoViewFinishedCallbackDelegate = (OnFinished);
-                    FinishedSignal().Connect(_videoViewFinishedCallbackDelegate);
-                }
-                _videoViewFinishedEventHandler += value;
-            }
-            remove
-            {
-                _videoViewFinishedEventHandler -= value;
-                if (_videoViewFinishedEventHandler == null && FinishedSignal().Empty() == false)
-                {
-                    FinishedSignal().Disconnect(_videoViewFinishedCallbackDelegate);
-                }
-            }
-        }
-
-        // Callback for VideoView Finished signal
-        private void OnFinished(IntPtr data)
-        {
-            FinishedEventArgs e = new FinishedEventArgs();
-
-            // Populate all members of "e" (FinishedEventArgs) with real data
-            e.VideoView = VideoView.GetVideoViewFromPtr(data);
-
-            if (_videoViewFinishedEventHandler != null)
-            {
-                //here we send all data to user event handlers
-                _videoViewFinishedEventHandler(this, e);
-            }
-        }
-
-        internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr)
-        {
-            VideoView ret = new VideoView(cPtr, false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-
-        internal class Property
-        {
-            internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();
-            internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();
-            internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();
-            internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();
-        }
-
-        /// <summary>
-        /// Creates an initialized VideoView.
-        /// </summary>
-        public VideoView() : this(NDalicPINVOKE.VideoView_New__SWIG_0(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-
-        /// <summary>
-        /// Creates an initialized VideoView.<br>
-        /// If the string is empty, VideoView will not display anything.<br>
-        /// </summary>
-        /// <param name="url">The url of the video resource to display</param>
-        public VideoView(string url) : this(NDalicPINVOKE.VideoView_New__SWIG_1(url), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        internal VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Downcasts a handle to VideoView handle.<br>
-        /// If handle points to a VideoView, the downcast produces valid handle.<br>
-        /// If not, the returned handle is left uninitialized.<br>
-        /// </summary>
-        /// <param name="handle">Handle to an object</param>
-        /// <returns>Handle to a VideoView or an uninitialized handle</returns>
-        internal new static VideoView DownCast(BaseHandle handle)
-        {
-            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Starts the video playback.
-        /// </summary>
-        public void Play()
-        {
-            NDalicPINVOKE.VideoView_Play(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Pauses the video playback.
-        /// </summary>
-        public void Pause()
-        {
-            NDalicPINVOKE.VideoView_Pause(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Stops the video playback.
-        /// </summary>
-        public void Stop()
-        {
-            NDalicPINVOKE.VideoView_Stop(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Seeks forward by the specified number of milliseconds.
-        /// </summary>
-        /// <param name="millisecond">The position for forward playback</param>
-        public void Forward(int millisecond)
-        {
-            NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Seeks backward by the specified number of milliseconds.
-        /// </summary>
-        /// <param name="millisecond">The position for backward playback</param>
-        public void Backward(int millisecond)
-        {
-            NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal VideoViewSignal FinishedSignal()
-        {
-            VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// video file url as string type or PropertyMap.
-        /// </summary>
-        public PropertyMap Video
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(VideoView.Property.VIDEO).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(VideoView.Property.VIDEO, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// looping status, true or false.
-        /// </summary>
-        public bool Looping
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(VideoView.Property.LOOPING).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(VideoView.Property.LOOPING, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// mute status, true or false.
-        /// </summary>
-        public bool Muted
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(VideoView.Property.MUTED).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(VideoView.Property.MUTED, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
-        /// left and right volume scalar as float type, PropertyMap with two values ( "left" and "right" ).
-        /// </summary>
-        public PropertyMap Volume
-        {
-            get
-            {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(VideoView.Property.VOLUME).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(VideoView.Property.VOLUME, new PropertyValue(value));
-            }
-        }
-
-    }
-
-}
index e2d05a78f852e7366d8a4bef429cd4d8c41d7751..866720e9806b36ed779f8d4f90c3ee9904c115dc 100755 (executable)
@@ -103,19 +103,19 @@ namespace Tizen.NUI
             return ret;
        }
 
-        /// <summary>
-        /// Sets the focus acceptable flag of an window as true.
-        /// </summary>
-        internal void SetAcceptFocus(bool accept)
+        /*********************************************************************************/\r
+        /*** will be removed/deprecated                                                  ***/\r
+        /*********************************************************************************/\r
+        public void SetAcceptFocus(bool accept)
         {
             NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// <summary>
-        /// Retrieves whether the window is focus acceptable or not.
-        /// </summary>
-        internal bool IsFocusAcceptable()
+        /*********************************************************************************/\r
+        /*** will be removed/deprecated                                                  ***/\r
+        /*********************************************************************************/\r
+        public bool IsFocusAcceptable()
         {
             return NDalicPINVOKE.IsFocusAcceptable(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();