Revert "[Tizen] changes for preview#4 release"

This reverts commit 363d383e6c2e180ccca394ed0cfd67af1f4ba3cb.

Change-Id: Ia44b12848fd229340ab155b81900aa48b9d9a1b7

diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs
index 6e5a521..0001b89 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Builder.cs
+++ b/src/Tizen.NUI/src/internal/Builder.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI
     using Tizen.NUI.BaseComponents;
 
 
-    public class Builder : BaseHandle
+    internal class Builder : BaseHandle
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/Size.cs b/src/Tizen.NUI/src/internal/Size.cs
index 83cd23b..c656b01 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Size.cs
+++ b/src/Tizen.NUI/src/internal/Size.cs
@@ -16,12 +16,12 @@
  */
 
 namespace Tizen.NUI
-{\r
-\r
-    /*********************************************************************************/\r
-    /*** will be removed/deprecated                                                  ***/\r
-    /*********************************************************************************/\r
-    public class Size : global::System.IDisposable
+{
+
+    /// <summary>
+    /// Three dimensional size
+    /// </summary>
+    internal class Size : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         protected bool swigCMemOwn;

diff --git a/src/Tizen.NUI/src/public/UIComponents/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/UIComponents/Slider.cs
rename to src/Tizen.NUI/src/internal/Slider.cs
index ff7b0fd..a6abd07 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/Slider.cs
+++ b/src/Tizen.NUI/src/internal/Slider.cs
@@ -34,7 +34,7 @@ namespace Tizen.NUI.UIComponents
     /// <summary>
     /// Slider is a control to enable sliding an indicator between two values.
     /// </summary>
-    public class Slider : View
+    internal class Slider : View
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/VideoViewSignal.cs b/src/Tizen.NUI/src/internal/VideoViewSignal.cs
index 10ff327..18b79f8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VideoViewSignal.cs
+++ b/src/Tizen.NUI/src/internal/VideoViewSignal.cs
@@ -8,8 +8,6 @@
 // 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/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 9113d68..2ac63f0 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -3656,62 +3656,6 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-
-
-
-
-        /*********************************************************************************/
-        /*** will be removed/deprecated                                                  ***/
-        /*********************************************************************************/
-        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);
-                }
-
-            }
-        }
-        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);
-                }
-
-            }
-        }
-
         /// <summary>
         /// Get the number of renderers held by the view.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
rename to src/Tizen.NUI/src/public/FlexContainer.cs
index 9dc26f7..0e598d6 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
+++ b/src/Tizen.NUI/src/public/FlexContainer.cs
@@ -24,7 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI.BaseComponents
+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>

diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs
index 6eedcc6..cd559ae 100755 (executable)
--- a/src/Tizen.NUI/src/public/NUIConstants.cs
+++ b/src/Tizen.NUI/src/public/NUIConstants.cs
@@ -1366,149 +1366,6 @@ namespace Tizen.NUI
         Implicit,   //Called by DisposeQueue
     }
 
-
-
-
-    //will be removed/deprecated
-    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;
-            }
-        }
-    }
-
     /// <summary>
     /// An enum of scroll state of text eidtor.
     /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs b/src/Tizen.NUI/src/public/Scrollable.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs
rename to src/Tizen.NUI/src/public/Scrollable.cs
index 4f747aa..f6edecc 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs
+++ b/src/Tizen.NUI/src/public/Scrollable.cs
@@ -8,11 +8,12 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI.BaseComponents
+namespace Tizen.NUI
 {
 
     using System;
     using System.Runtime.InteropServices;
+    using Tizen.NUI.BaseComponents;
 
     public class Scrollable : View
     {

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/BaseComponents/TableView.cs
rename to src/Tizen.NUI/src/public/TableView.cs
index 7d8c0c7..01a94ea 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TableView.cs
+++ b/src/Tizen.NUI/src/public/TableView.cs
@@ -24,9 +24,11 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI.BaseComponents
-{
+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>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
rename to src/Tizen.NUI/src/public/VideoView.cs
index 13e4b4b..af52689 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
+++ b/src/Tizen.NUI/src/public/VideoView.cs
@@ -24,11 +24,12 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI.BaseComponents
+namespace Tizen.NUI
 {
 
     using System;
     using System.Runtime.InteropServices;
+    using Tizen.NUI.BaseComponents;
 
     /// <summary>
     /// VideoView is a control for video playback and display.

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index dcf69ad..9718abd 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -103,19 +103,19 @@ namespace Tizen.NUI
             return ret;
        }
 
-        /*********************************************************************************/\r
-        /*** will be removed/deprecated                                                  ***/\r
-        /*********************************************************************************/\r
-        public void SetAcceptFocus(bool accept)
+        /// <summary>
+        /// Sets the focus acceptable flag of an window as true.
+        /// </summary>
+        internal void SetAcceptFocus(bool accept)
         {
             NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /*********************************************************************************/\r
-        /*** will be removed/deprecated                                                  ***/\r
-        /*********************************************************************************/\r
-        public bool IsFocusAcceptable()
+        /// <summary>
+        /// Retrieves whether the window is focus acceptable or not.
+        /// </summary>
+        internal bool IsFocusAcceptable()
         {
             return NDalicPINVOKE.IsFocusAcceptable(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();