From: dongsug.song <dongsug.song@samsung.com>
Date: Tue, 13 Jun 2017 14:06:59 +0000 (+0900)
Subject: [Tizen] some APIs are changed for preview#4
X-Git-Tag: preview1-00180^2~247
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5cd843d318a2acabb07e5629c97ca6df76ad77c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[Tizen] some APIs are changed for preview#4

Change-Id: I4e7479cce87fc576796b49eaa9c0b7fbeb65315c
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
---

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 3e1ea1adb..3875e18a0 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1772,7 +1772,7 @@ namespace Tizen.NUI.BaseComponents
         /// <remarks>
         /// Readonly.
         /// </remarks>
-        internal Vector3 NaturalSize
+        public Vector3 NaturalSize
         {
             get
             {
@@ -3589,7 +3589,7 @@ namespace Tizen.NUI.BaseComponents
 
             }
         }
-        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRolled
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelMoved
         {
             add
             {
diff --git a/src/Tizen.NUI/src/public/ProgressBar.cs b/src/Tizen.NUI/src/public/ProgressBar.cs
deleted file mode 100755
index 6085d4077..000000000
--- a/src/Tizen.NUI/src/public/ProgressBar.cs
+++ /dev/null
@@ -1,381 +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>
-    /// ProgressBar is a control to give the user an indication of the progress of an operation.
-    /// </summary>
-    public class ProgressBar : View
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal ProgressBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ProgressBar_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(ProgressBar obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        /// <summary>
-        /// To make ProgressBar instance be disposed.
-        /// </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_ProgressBar(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        /// <summary>
-        /// Event arguments that passed via ValueChangedEventArgs
-        /// </summary>
-        public class ValueChangedEventArgs : EventArgs
-        {
-            private ProgressBar _progressBar;
-            private float _progressValue;
-            private float _secondaryProgressValue;
-
-            public ProgressBar ProgressBar
-            {
-                get
-                {
-                    return _progressBar;
-                }
-                set
-                {
-                    _progressBar = value;
-                }
-            }
-
-            public float ProgressValue
-            {
-                get
-                {
-                    return _progressValue;
-                }
-                set
-                {
-                    _progressValue = value;
-                }
-            }
-
-            public float SecondaryProgressValue
-            {
-                get
-                {
-                    return _secondaryProgressValue;
-                }
-                set
-                {
-                    _secondaryProgressValue = value;
-                }
-            }
-
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void ValueChangedCallbackDelegate(IntPtr progressBar, float progressValue, float secondaryProgressValue);
-        private EventHandler<ValueChangedEventArgs> _progressBarValueChangedEventHandler;
-        private ValueChangedCallbackDelegate _progressBarValueChangedCallbackDelegate;
-
-        /// <summary>
-        /// Event is sent when the ProgressBar value changes.
-        /// </summary>
-        public event EventHandler<ValueChangedEventArgs> ValueChanged
-        {
-            add
-            {
-                if (_progressBarValueChangedEventHandler == null)
-                {
-                    _progressBarValueChangedCallbackDelegate = (OnValueChanged);
-                    ValueChangedSignal().Connect(_progressBarValueChangedCallbackDelegate);
-                }
-                _progressBarValueChangedEventHandler += value;
-            }
-            remove
-            {
-                _progressBarValueChangedEventHandler -= value;
-                if (_progressBarValueChangedEventHandler == null && ValueChangedSignal().Empty() == false)
-                {
-                    ValueChangedSignal().Disconnect(_progressBarValueChangedCallbackDelegate);
-                }
-            }
-        }
-
-        // Callback for ProgressBar ValueChanged signal
-        private void OnValueChanged(IntPtr progressBar, float progressValue, float secondaryProgressValue)
-        {
-            ValueChangedEventArgs e = new ValueChangedEventArgs();
-
-            // Populate all members of "e" (ValueChangedEventArgs) with real page
-            e.ProgressBar = ProgressBar.GetProgressBarFromPtr(progressBar);
-            e.ProgressValue = progressValue;
-            e.SecondaryProgressValue = secondaryProgressValue;
-
-            if (_progressBarValueChangedEventHandler != null)
-            {
-                _progressBarValueChangedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
-        /// </summary>
-        internal static ProgressBar GetProgressBarFromPtr(global::System.IntPtr cPtr)
-        {
-            ProgressBar ret = new ProgressBar(cPtr, false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal class Property
-        {
-            internal static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get();
-            internal static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get();
-            internal static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get();
-            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.ProgressBar_Property_TRACK_VISUAL_get();
-            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VISUAL_get();
-            internal static readonly int SECONDARY_PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VISUAL_get();
-            internal static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get();
-            internal static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get();
-            internal static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get();
-        }
-
-        /// <summary>
-        /// Creates the ProgressBar.
-        /// </summary>
-        public ProgressBar() : this(NDalicPINVOKE.ProgressBar_New(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-
-        internal ProgressBarValueChangedSignal ValueChangedSignal()
-        {
-            ProgressBarValueChangedSignal ret = new ProgressBarValueChangedSignal(NDalicPINVOKE.ProgressBar_ValueChangedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// The progress value of progress bar, progress runs form 0 to 1.<br>
-        /// If Value is set to 0, progress bar will be set to beginning.<br>
-        /// If Value is set to 1, progress bar will be set to end.<br>
-        /// Any Value outside of the range is ignored.<br>
-        /// </summary>
-        public float ProgressValue
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(ProgressBar.Property.PROGRESS_VALUE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The secondary progress value of progress bar, secondary progress runs form 0 to 1.<br>
-        /// Optional. If not supplied, the default is 0.<br>
-        /// If Value is set to 0, progress bar will be set secondary progress to beginning.<br>
-        /// If Value is set to 1, progress bar will be set secondary progress to end.<br>
-        /// Any Value outside of the range is ignored.<br>
-        /// </summary>
-        public float SecondaryProgressValue
-        {
-            get
-            {
-                float temp = 0.0f;
-                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// Sets the progress-bar as \e indeterminate state.
-        /// </summary>
-        public bool Indeterminate
-        {
-            get
-            {
-                bool temp = false;
-                GetProperty(ProgressBar.Property.INDETERMINATE).Get(out temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.INDETERMINATE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The track Visual value of progress bar, it's a full progress area and it's shown behind PROGRESS_VISUAL.<br>
-        /// Optional. If not supplied, the default track visual will be shown.<br>
-        /// </summary>
-        public Tizen.NUI.PropertyMap TrackVisual
-        {
-            get
-            {
-                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty(ProgressBar.Property.TRACK_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The progress Visual value of progress bar, size of the progress visual is changed based on PROGRESS_VALUE.<br>
-        /// Optional. If not supplied, the default progress visual will be shown.<br>
-        /// </summary>
-        public Tizen.NUI.PropertyMap ProgressVisual
-        {
-            get
-            {
-                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty(ProgressBar.Property.PROGRESS_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The secondary progress visual of progress bar, size of the secondary progress visual is changed based on SECONDARY_PROGRESS_VALUE.<br>
-        /// Optional. If not supplied, the secondary progress visual will not be shown.<br>
-        /// </summary>
-        public Tizen.NUI.PropertyMap SecondaryProgressVisual
-        {
-            get
-            {
-                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The indeterminate visual of progress bar.<br>
-        /// Optional. If not supplied, the default inditerminate visual will be shown.<br>
-        /// </summary>
-        public Tizen.NUI.PropertyMap IndeterminateVisual
-        {
-            get
-            {
-                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The transition data for indeterminate visual animation.<br>
-        /// Optional. If not supplied, default animation will be played.<br>
-        /// </summary>
-        public Tizen.NUI.PropertyArray IndeterminateVisualAnimation
-        {
-            get
-            {
-                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-        /// <summary>
-        /// The Label visual of progress bar.
-        /// </summary>
-        public Tizen.NUI.PropertyMap LabelVisual
-        {
-            get
-            {
-                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                GetProperty(ProgressBar.Property.LABEL_VISUAL).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(ProgressBar.Property.LABEL_VISUAL, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-    }
-
-}
diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs
index 7f616634d..9abbc3ec2 100755
--- a/src/Tizen.NUI/src/public/Property.cs
+++ b/src/Tizen.NUI/src/public/Property.cs
@@ -903,6 +903,18 @@ namespace Tizen.NUI
             return ret;
         }
 
+        /// <summary>
+        /// Retrieves the key at the specified position.
+        /// </summary>
+        /// <param name="position">The specified position</param>
+        /// <returns>A reference to the key at the specified position</returns>
+        public string GetKey(uint position)
+        {
+            string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
         /// <summary>
         /// Retrieve the key at the specified position.
         /// </summary>
@@ -920,7 +932,20 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="key">The key to find</param>
         /// <returns>The value if it exists, an empty object otherwise</returns>
-        internal PropertyValue Find(int key)
+        public PropertyValue Find(string key)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <returns>The value if it exists, an empty object otherwise</returns>
+        public PropertyValue Find(int key)
         {
             global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key);
             PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
@@ -942,6 +967,34 @@ namespace Tizen.NUI
             return ret;
         }
 
+        /// <summary>
+        /// Finds the value for the specified key if it exists and its type is type.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <param name="type">The type to check</param>
+        /// <returns>The value if it exists, an empty value otherwise</returns>
+        public PropertyValue Find(string key, PropertyType type)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists and its type is type.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <param name="type">The type to check</param>
+        /// <returns>The value if it exists, an empty value otherwise</returns>
+        public PropertyValue Find(int key, PropertyType type)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
         /// <summary>
         /// Clears the map.
         /// </summary>
diff --git a/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
new file mode 100755
index 000000000..6085d4077
--- /dev/null
+++ b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
@@ -0,0 +1,381 @@
+/** 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>
+    /// ProgressBar is a control to give the user an indication of the progress of an operation.
+    /// </summary>
+    public class ProgressBar : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal ProgressBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ProgressBar_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(ProgressBar obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        /// <summary>
+        /// To make ProgressBar instance be disposed.
+        /// </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_ProgressBar(swigCPtr);
+                }
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            }
+
+            base.Dispose(type);
+        }
+
+
+        /// <summary>
+        /// Event arguments that passed via ValueChangedEventArgs
+        /// </summary>
+        public class ValueChangedEventArgs : EventArgs
+        {
+            private ProgressBar _progressBar;
+            private float _progressValue;
+            private float _secondaryProgressValue;
+
+            public ProgressBar ProgressBar
+            {
+                get
+                {
+                    return _progressBar;
+                }
+                set
+                {
+                    _progressBar = value;
+                }
+            }
+
+            public float ProgressValue
+            {
+                get
+                {
+                    return _progressValue;
+                }
+                set
+                {
+                    _progressValue = value;
+                }
+            }
+
+            public float SecondaryProgressValue
+            {
+                get
+                {
+                    return _secondaryProgressValue;
+                }
+                set
+                {
+                    _secondaryProgressValue = value;
+                }
+            }
+
+        }
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void ValueChangedCallbackDelegate(IntPtr progressBar, float progressValue, float secondaryProgressValue);
+        private EventHandler<ValueChangedEventArgs> _progressBarValueChangedEventHandler;
+        private ValueChangedCallbackDelegate _progressBarValueChangedCallbackDelegate;
+
+        /// <summary>
+        /// Event is sent when the ProgressBar value changes.
+        /// </summary>
+        public event EventHandler<ValueChangedEventArgs> ValueChanged
+        {
+            add
+            {
+                if (_progressBarValueChangedEventHandler == null)
+                {
+                    _progressBarValueChangedCallbackDelegate = (OnValueChanged);
+                    ValueChangedSignal().Connect(_progressBarValueChangedCallbackDelegate);
+                }
+                _progressBarValueChangedEventHandler += value;
+            }
+            remove
+            {
+                _progressBarValueChangedEventHandler -= value;
+                if (_progressBarValueChangedEventHandler == null && ValueChangedSignal().Empty() == false)
+                {
+                    ValueChangedSignal().Disconnect(_progressBarValueChangedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for ProgressBar ValueChanged signal
+        private void OnValueChanged(IntPtr progressBar, float progressValue, float secondaryProgressValue)
+        {
+            ValueChangedEventArgs e = new ValueChangedEventArgs();
+
+            // Populate all members of "e" (ValueChangedEventArgs) with real page
+            e.ProgressBar = ProgressBar.GetProgressBarFromPtr(progressBar);
+            e.ProgressValue = progressValue;
+            e.SecondaryProgressValue = secondaryProgressValue;
+
+            if (_progressBarValueChangedEventHandler != null)
+            {
+                _progressBarValueChangedEventHandler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        internal static ProgressBar GetProgressBarFromPtr(global::System.IntPtr cPtr)
+        {
+            ProgressBar ret = new ProgressBar(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal class Property
+        {
+            internal static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get();
+            internal static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get();
+            internal static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get();
+            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.ProgressBar_Property_TRACK_VISUAL_get();
+            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VISUAL_get();
+            internal static readonly int SECONDARY_PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VISUAL_get();
+            internal static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get();
+            internal static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get();
+            internal static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get();
+        }
+
+        /// <summary>
+        /// Creates the ProgressBar.
+        /// </summary>
+        public ProgressBar() : this(NDalicPINVOKE.ProgressBar_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        internal ProgressBarValueChangedSignal ValueChangedSignal()
+        {
+            ProgressBarValueChangedSignal ret = new ProgressBarValueChangedSignal(NDalicPINVOKE.ProgressBar_ValueChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// The progress value of progress bar, progress runs form 0 to 1.<br>
+        /// If Value is set to 0, progress bar will be set to beginning.<br>
+        /// If Value is set to 1, progress bar will be set to end.<br>
+        /// Any Value outside of the range is ignored.<br>
+        /// </summary>
+        public float ProgressValue
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ProgressBar.Property.PROGRESS_VALUE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The secondary progress value of progress bar, secondary progress runs form 0 to 1.<br>
+        /// Optional. If not supplied, the default is 0.<br>
+        /// If Value is set to 0, progress bar will be set secondary progress to beginning.<br>
+        /// If Value is set to 1, progress bar will be set secondary progress to end.<br>
+        /// Any Value outside of the range is ignored.<br>
+        /// </summary>
+        public float SecondaryProgressValue
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the progress-bar as \e indeterminate state.
+        /// </summary>
+        public bool Indeterminate
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(ProgressBar.Property.INDETERMINATE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The track Visual value of progress bar, it's a full progress area and it's shown behind PROGRESS_VISUAL.<br>
+        /// Optional. If not supplied, the default track visual will be shown.<br>
+        /// </summary>
+        public Tizen.NUI.PropertyMap TrackVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.TRACK_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The progress Visual value of progress bar, size of the progress visual is changed based on PROGRESS_VALUE.<br>
+        /// Optional. If not supplied, the default progress visual will be shown.<br>
+        /// </summary>
+        public Tizen.NUI.PropertyMap ProgressVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The secondary progress visual of progress bar, size of the secondary progress visual is changed based on SECONDARY_PROGRESS_VALUE.<br>
+        /// Optional. If not supplied, the secondary progress visual will not be shown.<br>
+        /// </summary>
+        public Tizen.NUI.PropertyMap SecondaryProgressVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The indeterminate visual of progress bar.<br>
+        /// Optional. If not supplied, the default inditerminate visual will be shown.<br>
+        /// </summary>
+        public Tizen.NUI.PropertyMap IndeterminateVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The transition data for indeterminate visual animation.<br>
+        /// Optional. If not supplied, default animation will be played.<br>
+        /// </summary>
+        public Tizen.NUI.PropertyArray IndeterminateVisualAnimation
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The Label visual of progress bar.
+        /// </summary>
+        public Tizen.NUI.PropertyMap LabelVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.LABEL_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.LABEL_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+}
diff --git a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
index c6ec224ec..db7986984 100755
--- a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
@@ -56,7 +56,7 @@ namespace Tizen.NUI.UIComponents
                 return;
             }
 
-            if(type == DisposeTypes.Explicit)
+            if (type == DisposeTypes.Explicit)
             {
                 //Called by User
                 //Release your own managed resources here.
@@ -99,18 +99,234 @@ namespace Tizen.NUI.UIComponents
 
         }
 
-        /// <summary>
-        /// Downcasts a handle to PushButton handle.<br>
-        /// If handle points to a PushButton, 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 PushButton or an uninitialized handle</returns>
-        internal new static PushButton DownCast(BaseHandle handle)
-        {
-            PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-    }
+        internal PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PushButton Assign(PushButton pushButton)
+        {
+            PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to PushButton handle.<br>
+        /// If handle points to a PushButton, 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 PushButton or an uninitialized handle</returns>
+        internal new static PushButton DownCast(BaseHandle handle)
+        {
+            PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal new void SetButtonImage(Image image)
+        {
+            NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetButtonImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetBackgroundImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal new void SetSelectedImage(Image image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSelectedImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSelectedBackgroundImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledBackgroundImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledSelectedImage(View image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Sets the unselected button image.
+        /// </summary>
+        public string UnselectedIcon
+        {
+            set
+            {
+                SetProperty(PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the selected button image.
+        /// </summary>
+        public string SelectedIcon
+        {
+            set
+            {
+                SetProperty(PushButton.Property.SELECTED_ICON, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the icon alignment.
+        /// </summary>
+        public IconAlignmentType IconAlignment
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(PushButton.Property.ICON_ALIGNMENT).Get(out temp) == false)
+                {
+#if DEBUG_ON
+                    Tizen.Log.Error("NUI", "IconAlignment get error!");
+#endif
+                }
+                switch (temp)
+                {
+                    case "LEFT":
+                        return IconAlignmentType.Left;
+                    case "RIGHT":
+                        return IconAlignmentType.Right;
+                    case "TOP":
+                        return IconAlignmentType.Top;
+                    case "BOTTOM":
+                        return IconAlignmentType.Bottom;
+                    default:
+                        return IconAlignmentType.Default;
+                }
+            }
+            set
+            {
+                string valueToString = "";
+                switch (value)
+                {
+                    case IconAlignmentType.Left:
+                        {
+                            valueToString = "LEFT";
+                            break;
+                        }
+                    case IconAlignmentType.Right:
+                        {
+                            valueToString = "RIGHT";
+                            break;
+                        }
+                    case IconAlignmentType.Top:
+                        {
+                            valueToString = "TOP";
+                            break;
+                        }
+                    case IconAlignmentType.Bottom:
+                        {
+                            valueToString = "BOTTOM";
+                            break;
+                        }
+                    default:
+                        {
+                            valueToString = "DEFAULT";
+                            break;
+                        }
+                }
+                SetProperty(PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.PropertyValue(valueToString));
+            }
+        }
+        /// <summary>
+        /// Sets the label padding value.
+        /// </summary>
+        public Vector4 LabelPadding
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(PushButton.Property.LABEL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PushButton.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Sets the icon padding value.
+        /// </summary>
+        public Vector4 IconPadding
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(PushButton.Property.ICON_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PushButton.Property.ICON_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Enumeration for the alignment modes of the icon.
+        /// </summary>
+        public enum IconAlignmentType
+        {
+            /// <summary>
+            /// Icon located to the left of text.
+            /// </summary>
+            Left,
+            /// <summary>
+            /// Icon located to the right of text.
+            /// </summary>
+            Right,
+            /// <summary>
+            /// Icon located to the top of text.
+            /// </summary>
+            Top,
+            /// <summary>
+            /// Icon located to the bottom of text.
+            /// </summary>
+            Bottom,
+            /// <summary>
+            /// Icon located to the right of text by default.
+            /// </summary>
+            Default = Right
+        }
+
+    }
 }
diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index 866720e98..f9490efd4 100755
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -863,7 +863,7 @@ namespace Tizen.NUI
         /// then when the last finger is lifted.<br>
         /// An interrupted event will also be emitted (if it occurs).<br>
         /// </summary>
-        public event EventHandler<TouchEventArgs> Touched
+        public event EventHandler<TouchEventArgs> Touch
         {
             add
             {
@@ -931,7 +931,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Event emitted when wheel event is received.
         /// </summary>
-        public event EventHandler<WheelEventArgs> WheelRolled
+        public event EventHandler<WheelEventArgs> WheelRoll
         {
             add
             {
@@ -996,7 +996,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Event emitted when key event is received.
         /// </summary>
-        public event EventHandler<KeyEventArgs> KeyEvent
+        public event EventHandler<KeyEventArgs> Key
         {
             add
             {