Rename all C# Events to Past tense 42/133842/8
authorUmar <m.umar@partner.samsung.com>
Tue, 13 Jun 2017 13:30:52 +0000 (14:30 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 17:16:43 +0000 (18:16 +0100)
Change-Id: I5b33b4346c68d03a85c5a74da211963ff2125aa8

24 files changed:
NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs
Tizen.NUI/src/internal/Application.cs
Tizen.NUI/src/internal/Image.cs
Tizen.NUI/src/internal/NinePatchImage.cs [deleted file]
Tizen.NUI/src/internal/ResourceImage.cs [deleted file]
Tizen.NUI/src/internal/ResourceImageSignal.cs [deleted file]
Tizen.NUI/src/public/BaseComponents/View.cs
Tizen.NUI/src/public/FocusManager.cs
Tizen.NUI/src/public/UIComponents/Popup.cs
Tizen.NUI/src/public/UIComponents/ScrollBar.cs
Tizen.NUI/src/public/Window.cs

index 66bd7f4..5e854e5 100644 (file)
@@ -128,7 +128,7 @@ namespace DatePickerUsingJson
             return nextFocusView;
         }
 
-        private void OnFocusedViewActivated(object source, FocusManager.FocusedViewEnterKeyEventArgs e)
+        private void OnFocusedViewActivated(object source, FocusManager.FocusedViewActivatedEventArgs e)
         {
             // Make the text field in the current focused spin to take the key input
             KeyInputFocusManager manager = KeyInputFocusManager.Get();
index 8b5f53c..b707ca2 100644 (file)
@@ -153,7 +153,7 @@ namespace DatePickerTest
             return nextFocusView;
         }
 
-        private void OnFocusedViewActivated(object source, FocusManager.FocusedViewEnterKeyEventArgs e)
+        private void OnFocusedViewActivated(object source, FocusManager.FocusedViewActivatedEventArgs e)
         {
 
         }
index f3e7f90..1e11b77 100644 (file)
@@ -79,7 +79,7 @@ namespace FlexContainerTest
             };
 
             //added
-            Window.Instance.Touch += (sender, e) =>
+            Window.Instance.Touched += (sender, e) =>
             {
                 Tizen.Log.Debug("NUI", "Window Touch signal callback! To avoid crash, when losing key focus, set here again unless the NextView is null");
                 FocusManager.Instance.SetCurrentFocusView(label[3]);
index adf5b0d..4145383 100644 (file)
@@ -59,7 +59,7 @@ namespace HelloTest
         {
             // Connect the signal callback for window touched signal
             _window = Window.Instance;
-            _window.Touch += OnWindowTouched;
+            _window.Touched += OnWindowTouched;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");
@@ -82,7 +82,7 @@ namespace HelloTest
         }
 
         // Callback for window touched signal handling
-        private void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        private void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
index bead976..71f2a62 100755 (executable)
@@ -53,8 +53,8 @@ namespace HelloWorldTest
         {
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.Touch += OnWindowTouched;
-            window.Key += OnWindowKeyEvent;
+            window.Touched += OnWindowTouched;
+            window.KeyPressed += OnWindowKeyEvent;
 
             TextLabel pixelLabel = new TextLabel("Test Pixel Size 32.0f");
             pixelLabel.Position2D = new Position2D(10, 10);
@@ -146,7 +146,7 @@ namespace HelloWorldTest
             }
         }
 
-        public void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        public void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             if (e.Touch.GetState(0) == PointStateType.Down)
             {
index ceab16d..8f16634 100755 (executable)
@@ -63,9 +63,9 @@ namespace ImageViewTest
             Log("Customized Application Initialize event handler");
             window = Window.Instance;
             window.BackgroundColor = Color.Cyan;
-            window.Touch += OnWindowTouched;
-            window.WheelRoll += OnWindowWheelMoved;
-            window.Key += OnWindowKeyPressed;
+            window.Touched += OnWindowTouched;
+            window.WheelRolled += OnWindowWheelMoved;
+            window.KeyPressed += OnWindowKeyPressed;
             //window.EventProcessingFinished += OnWindowEventProcessingFinished;
 
             layer = window.GetDefaultLayer();
@@ -236,7 +236,7 @@ namespace ImageViewTest
             Log("state=" + e.Key.State);
         }
 
-        public void OnWindowWheelMoved(object sender, Window.WheelEventArgs e)
+        public void OnWindowWheelMoved(object sender, Window.WheelRolledEventArgs e)
         {
             Log("OnWindowWheelEventOccured()!");
             Log("direction=" + e.Wheel.Direction);
@@ -244,7 +244,7 @@ namespace ImageViewTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        public void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             Log("OnWindowTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0));
         }
index 86af43a..eaa8b7a 100644 (file)
@@ -58,7 +58,7 @@ namespace RelativeVectorTest
         private void Initialize()
         {
             _window = Window.Instance;
-            _window.Touch += OnWindowTouched;
+            _window.Touched += OnWindowTouched;
 
             _imageView = new ImageView();
             _imageView.ResourceUrl = resources+"/images/gallery-3.jpg";
@@ -70,7 +70,7 @@ namespace RelativeVectorTest
         }
 
         // Callback for window touched signal handling
-        private void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        private void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
index d7d4d62..7a3dadf 100644 (file)
@@ -137,7 +137,7 @@ namespace ScrollViewTest
       // Connect to the OnRelayout signal
       _scrollView.Relayout += OnScrollViewRelayout;
       //_scrollView.Touched += OnTouch;
-      _scrollView.WheelRoll += Onwheel;
+      _scrollView.WheelRolled += Onwheel;
       _scrollView.FocusGained += OnKey;
       _text = new TextLabel("View Touch Event Handler Test");
       _text.ParentOrigin = ParentOrigin.Center;
@@ -158,13 +158,13 @@ namespace ScrollViewTest
       Tizen.Log.Debug("NUI", "View Keyevent EVENT callback....");
     }
 
-    private bool Onwheel(object source, View.WheelEventArgs e)
+    private bool Onwheel(object source, View.WheelRolledEventArgs e)
     {
       Tizen.Log.Debug("NUI", "View Wheel EVENT callback....");
       return true;
     }
 
-    private bool OnTouch(object source, View.TouchEventArgs e)
+    private bool OnTouch(object source, View.TouchedEventArgs e)
     {
       Tizen.Log.Debug("NUI", "View TOUCH EVENT callback....");
 
index dfdb90d..ba4f0ef 100755 (executable)
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016 Samsung Electronics Co., Ltd.
+* 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.
index bc3aad6..dca7e30 100644 (file)
@@ -64,10 +64,10 @@ namespace UserAlphaFunctionTest
             Log("Initialize() is called!");
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.Touch += OnWindowTouched;
-            window.Touch += OnWindowTouched2;
+            window.Touched += OnWindowTouched;
+            window.Touched += OnWindowTouched2;
             //window.EventProcessingFinished += OnEventProcessingFinished;
-            window.WheelRoll += OnWindowWheelEvent;
+            window.WheelRolled += OnWindowWheelEvent;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");
@@ -150,7 +150,7 @@ namespace UserAlphaFunctionTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched(object source, Window.TouchEventArgs e)
+        public void OnWindowTouched(object source, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
@@ -166,7 +166,7 @@ namespace UserAlphaFunctionTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched2(object source, Window.TouchEventArgs e)
+        public void OnWindowTouched2(object source, Window.TouchedEventArgs e)
         {
             Log("OnWindowTouched2() is called!state=" + e.Touch.GetState(0));
         }
@@ -176,7 +176,7 @@ namespace UserAlphaFunctionTest
             Log("OnEventProcessingFinished() is called!");
         }
 
-        public void OnWindowWheelEvent(object source, Window.WheelEventArgs e)
+        public void OnWindowWheelEvent(object source, Window.WheelRolledEventArgs e)
         {
             Log("OnWindowWheelEvent() is called!");
             //Log("OnWindowWheelEvent() is called!direction="+ e.WheelEvent.direction + " timeStamp=" + e.WheelEvent.timeStamp );
index e1f74e0..ca45028 100644 (file)
@@ -60,10 +60,10 @@ namespace MyCSharpExample
             FocusManager.Instance.SetCurrentFocusView(view[0]);
             FocusManager.Instance.PreFocusChange += Instance_PreFocusChange;
 
-            Window.Instance.Touch += Instance_Touch;
+            Window.Instance.Touched += Instance_Touch;
         }
 
-        private void Instance_Touch(object sender, Window.TouchEventArgs e)
+        private void Instance_Touch(object sender, Window.TouchedEventArgs e)
         {
             Tizen.Log.Debug("NUI", "window touched! set key focus as view[0]!");
             FocusManager.Instance.SetCurrentFocusView(view[0]);
index f5592b6..876a899 100644 (file)
@@ -261,7 +261,7 @@ namespace VisualViewTest
             _visualView.AddVisual("npatchImageVisual1", npatchImageVisualMap1);
 
             _window = Window.Instance;
-            _window.WindowFocusChanged += (sender, ee) =>
+            _window.FocusChanged += (sender, ee) =>
             {
                 cnt++;
                 Tizen.Log.Debug("NUI", "[WindowFocusTest] WindowFocusChanged event comes! focus gained=" + ee.FocusGained);
index 056ce47..4bca14e 100644 (file)
@@ -137,20 +137,20 @@ namespace VisualViewTest2
                 "Enter - Change BG image\n";
             Window.Instance.Add(guide);
 
-            Window.Instance.Key += Instance_Key;
+            Window.Instance.KeyPressed += Instance_Key;
             FocusManager.Instance.SetCurrentFocusView(view[0]);
-            Window.Instance.Touch += Instance_Touch;
+            Window.Instance.Touched += Instance_Touch;
             _window = Window.Instance;
-            _window.WindowFocusChanged += _window_WindowFocusChanged;
+            _window.FocusChanged += _window_WindowFocusChanged;
 
         }
 
-        private void _window_WindowFocusChanged(object sender, Window.WindowFocusChangedEventArgs e)
+        private void _window_WindowFocusChanged(object sender, Window.FocusChangedEventArgs e)
         {
             Tizen.Log.Fatal("NUI", "window focus changed!() focus gained=" + e.FocusGained);
         }
 
-        private void Instance_Touch(object sender, Window.TouchEventArgs e)
+        private void Instance_Touch(object sender, Window.TouchedEventArgs e)
         {
             FocusManager.Instance.SetCurrentFocusView(view[0]);
         }
index aa8a9e6..eda52c5 100644 (file)
@@ -94,7 +94,7 @@ namespace VisualViewTest3
             _visualView.AddVisual("imageVisual1", imageVisualMap1);
 
             _window = Window.Instance;
-            _window.WindowFocusChanged += (sender, ee) =>
+            _window.FocusChanged += (sender, ee) =>
             {
                 cnt++;
                 Tizen.Log.Debug("NUI", "[WindowFocusTest] WindowFocusChanged event comes! focus gained=" + ee.FocusGained);
index 422857d..a1ab80a 100755 (executable)
@@ -55,7 +55,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationTerminate signal
       *
       */
-    internal class NUIApplicationTerminateEventArgs : EventArgs
+    internal class NUIApplicationTerminatingEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -79,7 +79,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationPause signal
       *
       */
-    internal class NUIApplicationPauseEventArgs : EventArgs
+    internal class NUIApplicationPausedEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -103,7 +103,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationResume signal
       *
       */
-    internal class NUIApplicationResumeEventArgs : EventArgs
+    internal class NUIApplicationResumedEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -151,7 +151,7 @@ namespace Tizen.NUI
       * @brief Event arguments that passed via NUIApplicationResize signal
       *
       */
-    internal class NUIApplicationResizeEventArgs : EventArgs
+    internal class NUIApplicationResizedEventArgs : EventArgs
     {
         private Application _application;
         /**
@@ -368,18 +368,18 @@ namespace Tizen.NUI
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;
+        private DaliEventHandler<object, NUIApplicationTerminatingEventArgs> _applicationTerminateEventHandler;
         private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
 
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationPauseEventArgs> _applicationPauseEventHandler;
+        private DaliEventHandler<object, NUIApplicationPausedEventArgs> _applicationPauseEventHandler;
         private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationResumeEventArgs> _applicationResumeEventHandler;
+        private DaliEventHandler<object, NUIApplicationResumedEventArgs> _applicationResumeEventHandler;
         private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -389,7 +389,7 @@ namespace Tizen.NUI
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);
-        private DaliEventHandler<object, NUIApplicationResizeEventArgs> _applicationResizeEventHandler;
+        private DaliEventHandler<object, NUIApplicationResizedEventArgs> _applicationResizeEventHandler;
         private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -474,9 +474,9 @@ namespace Tizen.NUI
         /**
           * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
           * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
-          *  provided by the user. Terminated signal is emitted when application is terminated
+          *  provided by the user. Terminated signal is emitted when application is terminating
           */
-        public event DaliEventHandler<object, NUIApplicationTerminateEventArgs> Terminated
+        public event DaliEventHandler<object, NUIApplicationTerminatingEventArgs> Terminating
         {
             add
             {
@@ -510,7 +510,7 @@ namespace Tizen.NUI
         // Callback for Application TerminateSignal
         private void OnNUIApplicationTerminate(IntPtr data)
         {
-            NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();
+            NUIApplicationTerminatingEventArgs e = new NUIApplicationTerminatingEventArgs();
 
             // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -527,7 +527,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
           * provided by the user. Paused signal is emitted when application is paused
           */
-        public event DaliEventHandler<object, NUIApplicationPauseEventArgs> Paused
+        public event DaliEventHandler<object, NUIApplicationPausedEventArgs> Paused
         {
             add
             {
@@ -561,7 +561,7 @@ namespace Tizen.NUI
         // Callback for Application PauseSignal
         private void OnNUIApplicationPause(IntPtr data)
         {
-            NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();
+            NUIApplicationPausedEventArgs e = new NUIApplicationPausedEventArgs();
 
             // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -578,7 +578,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
           *  provided by the user. Resumed signal is emitted when application is resumed
           */
-        public event DaliEventHandler<object, NUIApplicationResumeEventArgs> Resumed
+        public event DaliEventHandler<object, NUIApplicationResumedEventArgs> Resumed
         {
             add
             {
@@ -612,7 +612,7 @@ namespace Tizen.NUI
         // Callback for Application ResumeSignal
         private void OnNUIApplicationResume(IntPtr data)
         {
-            NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();
+            NUIApplicationResumedEventArgs e = new NUIApplicationResumedEventArgs();
 
             // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -680,7 +680,7 @@ namespace Tizen.NUI
           * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
           *  provided by the user. Resized signal is emitted when application is resized
           */
-        public event DaliEventHandler<object, NUIApplicationResizeEventArgs> Resized
+        public event DaliEventHandler<object, NUIApplicationResizedEventArgs> Resized
         {
             add
             {
@@ -714,7 +714,7 @@ namespace Tizen.NUI
         // Callback for Application ResizeSignal
         private void OnNUIApplicationResize(IntPtr data)
         {
-            NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();
+            NUIApplicationResizedEventArgs e = new NUIApplicationResizedEventArgs();
 
             // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data
             e.Application = Application.GetApplicationFromPtr(data);
@@ -830,7 +830,7 @@ namespace Tizen.NUI
 
         /**
           * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
+          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>)
           * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
           */
         public event DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> BatteryLow
@@ -1034,7 +1034,7 @@ namespace Tizen.NUI
         [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
         internal delegate void MemoryLowDelegateInternal();
 
-        static void Initialize()
+        static void Initialization()
         {
             // instance.InitDelegate();
         }
@@ -1056,7 +1056,7 @@ namespace Tizen.NUI
 
         internal void SetupDelegates()
         {
-            InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialize);
+            InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialization);
 #if DEBUG_ON
             Tizen.Log.Debug("NUI", "InitSignal connection count");
 #endif
index b133b54..b0e7b77 100755 (executable)
@@ -94,7 +94,7 @@ namespace Tizen.NUI
 
         /**
           * @brief Event for Uploaded signal which can be used to subscribe/unsubscribe the event handler
-          * (in the type of UploadedEventHandler-DaliEventHandler<object,UploadedEventArgs>) 
+          * (in the type of UploadedEventHandler-DaliEventHandler<object,UploadedEventArgs>)
           * provided by the user. Uploaded signal is emitted when the image data gets uploaded to GL.
           */
         public event DaliEventHandler<object, UploadedEventArgs> Uploaded
diff --git a/Tizen.NUI/src/internal/NinePatchImage.cs b/Tizen.NUI/src/internal/NinePatchImage.cs
deleted file mode 100755 (executable)
index 23d4b7a..0000000
+++ /dev/null
@@ -1,146 +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
-{
-
-    internal class NinePatchImage : ResourceImage
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal NinePatchImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NinePatchImage_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(NinePatchImage 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_NinePatchImage(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        public NinePatchImage(string filename) : this(NDalicPINVOKE.NinePatchImage_New(filename), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public new static NinePatchImage DownCast(BaseHandle handle)
-        {
-            NinePatchImage ret = new NinePatchImage(NDalicPINVOKE.NinePatchImage_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public NinePatchImage(NinePatchImage handle) : this(NDalicPINVOKE.new_NinePatchImage__SWIG_1(NinePatchImage.getCPtr(handle)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public NinePatchImage Assign(NinePatchImage rhs)
-        {
-            NinePatchImage ret = new NinePatchImage(NDalicPINVOKE.NinePatchImage_Assign(swigCPtr, NinePatchImage.getCPtr(rhs)), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public Vector4 GetStretchBorders()
-        {
-            Vector4 ret = new Vector4(NDalicPINVOKE.NinePatchImage_GetStretchBorders(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public VectorUint16Pair GetStretchPixelsX()
-        {
-            VectorUint16Pair ret = new VectorUint16Pair(NDalicPINVOKE.NinePatchImage_GetStretchPixelsX(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public VectorUint16Pair GetStretchPixelsY()
-        {
-            VectorUint16Pair ret = new VectorUint16Pair(NDalicPINVOKE.NinePatchImage_GetStretchPixelsY(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public Rectangle GetChildRectangle()
-        {
-            Rectangle ret = new Rectangle(NDalicPINVOKE.NinePatchImage_GetChildRectangle(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public BufferImage CreateCroppedBufferImage()
-        {
-            BufferImage ret = new BufferImage(NDalicPINVOKE.NinePatchImage_CreateCroppedBufferImage(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public static bool IsNinePatchUrl(string url)
-        {
-            bool ret = NDalicPINVOKE.NinePatchImage_IsNinePatchUrl(url);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-    }
-
-}
diff --git a/Tizen.NUI/src/internal/ResourceImage.cs b/Tizen.NUI/src/internal/ResourceImage.cs
deleted file mode 100755 (executable)
index 1ae3c26..0000000
+++ /dev/null
@@ -1,244 +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;
-
-
-    internal class ResourceImage : Image
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-        internal ResourceImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ResourceImage_SWIGUpcast(cPtr), cMemoryOwn)
-        {
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ResourceImage 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_ResourceImage(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            base.Dispose(type);
-        }
-
-
-        public class LoadingFinishedEventArgs : EventArgs
-        {
-            private ResourceImage _resourceImage;
-
-            public ResourceImage ResourceImage
-            {
-                get
-                {
-                    return _resourceImage;
-                }
-                set
-                {
-                    _resourceImage = value;
-                }
-            }
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void LoadingFinishedEventCallbackDelegate(IntPtr ResourceImage);
-        private DaliEventHandler<object, LoadingFinishedEventArgs> _resourceImageLoadingFinishedEventHandler;
-        private LoadingFinishedEventCallbackDelegate _resourceImageLoadingFinishedEventCallbackDelegate;
-
-        public event DaliEventHandler<object, LoadingFinishedEventArgs> LoadingFinished
-        {
-            add
-            {
-                lock (this)
-                {
-                    // Restricted to only one listener
-                    if (_resourceImageLoadingFinishedEventHandler == null)
-                    {
-                        _resourceImageLoadingFinishedEventHandler += value;
-
-                        _resourceImageLoadingFinishedEventCallbackDelegate = new LoadingFinishedEventCallbackDelegate(OnLoadingFinished);
-                        this.LoadingFinishedSignal().Connect(_resourceImageLoadingFinishedEventCallbackDelegate);
-                    }
-                }
-            }
-
-            remove
-            {
-                lock (this)
-                {
-                    if (_resourceImageLoadingFinishedEventHandler != null)
-                    {
-                        this.LoadingFinishedSignal().Disconnect(_resourceImageLoadingFinishedEventCallbackDelegate);
-                    }
-
-                    _resourceImageLoadingFinishedEventHandler -= value;
-                }
-            }
-        }
-
-        // Callback for ResourceImage LoadingFinishedSignal
-        private void OnLoadingFinished(IntPtr data)
-        {
-            LoadingFinishedEventArgs e = new LoadingFinishedEventArgs();
-
-            // Populate all members of "e" (LoadingFinishedEventArgs) with real data
-            e.ResourceImage = ResourceImage.GetResourceImageFromPtr(data);
-
-            if (_resourceImageLoadingFinishedEventHandler != null)
-            {
-                //here we send all data to user event handlers
-                _resourceImageLoadingFinishedEventHandler(this, e);
-            }
-        }
-
-
-        public static ResourceImage GetResourceImageFromPtr(global::System.IntPtr cPtr)
-        {
-            ResourceImage ret = new ResourceImage(cPtr, false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-
-        public static Uint16Pair GetImageSize(string url)
-        {
-            Uint16Pair ret = new Uint16Pair(NDalicPINVOKE.ResourceImage_GetImageSize(url), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public ResourceImage(string url, bool orientationCorrection) : this(NDalicPINVOKE.ResourceImage_New__SWIG_0(url, orientationCorrection), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(string url) : this(NDalicPINVOKE.ResourceImage_New__SWIG_1(url), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(string url, Uint16Pair size, FittingModeType fittingMode, SamplingModeType samplingMode, bool orientationCorrection) : this(NDalicPINVOKE.ResourceImage_New__SWIG_2(url, Uint16Pair.getCPtr(size), (int)fittingMode, (int)samplingMode, orientationCorrection), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(string url, Uint16Pair size, FittingModeType fittingMode, SamplingModeType samplingMode) : this(NDalicPINVOKE.ResourceImage_New__SWIG_3(url, Uint16Pair.getCPtr(size), (int)fittingMode, (int)samplingMode), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(string url, Uint16Pair size, FittingModeType fittingMode) : this(NDalicPINVOKE.ResourceImage_New__SWIG_4(url, Uint16Pair.getCPtr(size), (int)fittingMode), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(string url, Uint16Pair size) : this(NDalicPINVOKE.ResourceImage_New__SWIG_5(url, Uint16Pair.getCPtr(size)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-        }
-        public ResourceImage(ResourceImage handle) : this(NDalicPINVOKE.new_ResourceImage__SWIG_1(ResourceImage.getCPtr(handle)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public ResourceImage Assign(ResourceImage rhs)
-        {
-            ResourceImage ret = new ResourceImage(NDalicPINVOKE.ResourceImage_Assign(swigCPtr, ResourceImage.getCPtr(rhs)), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public new static ResourceImage DownCast(BaseHandle handle)
-        {
-            ResourceImage ret = new ResourceImage(NDalicPINVOKE.ResourceImage_DownCast(BaseHandle.getCPtr(handle)), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public LoadingState GetLoadingState()
-        {
-            LoadingState ret = (LoadingState)NDalicPINVOKE.ResourceImage_GetLoadingState(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public string GetUrl()
-        {
-            string ret = NDalicPINVOKE.ResourceImage_GetUrl(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public void Reload()
-        {
-            NDalicPINVOKE.ResourceImage_Reload(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public ResourceImageSignal LoadingFinishedSignal()
-        {
-            ResourceImageSignal ret = new ResourceImageSignal(NDalicPINVOKE.ResourceImage_LoadingFinishedSignal(swigCPtr), false);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-    }
-
-}
diff --git a/Tizen.NUI/src/internal/ResourceImageSignal.cs b/Tizen.NUI/src/internal/ResourceImageSignal.cs
deleted file mode 100755 (executable)
index f5c55fc..0000000
+++ /dev/null
@@ -1,142 +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
-{
-
-    internal class ResourceImageSignal : global::System.IDisposable
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        protected bool swigCMemOwn;
-
-        internal ResourceImageSignal(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(ResourceImageSignal obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        //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;
-
-
-        ~ResourceImageSignal()
-        {
-            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_ResourceImageSignal(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            disposed = true;
-        }
-
-
-        public bool Empty()
-        {
-            bool ret = NDalicPINVOKE.ResourceImageSignal_Empty(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public uint GetConnectionCount()
-        {
-            uint ret = NDalicPINVOKE.ResourceImageSignal_GetConnectionCount(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        public void Connect(System.Delegate func)
-        {
-            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
-            {
-                NDalicPINVOKE.ResourceImageSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-        }
-
-        public void Disconnect(System.Delegate func)
-        {
-            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
-            {
-                NDalicPINVOKE.ResourceImageSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-        }
-
-        public void Emit(ResourceImage arg)
-        {
-            NDalicPINVOKE.ResourceImageSignal_Emit(swigCPtr, ResourceImage.getCPtr(arg));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        public ResourceImageSignal() : this(NDalicPINVOKE.new_ResourceImageSignal(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-    }
-
-}
index 1d9ef46..3e85455 100755 (executable)
@@ -274,7 +274,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Touch signal.
         /// </summary>
-        public class TouchEventArgs : EventArgs
+        public class TouchedEventArgs : EventArgs
         {
             private Touch _touch;
 
@@ -294,7 +294,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, TouchEventArgs, bool> _touchDataEventHandler;
+        private EventHandlerWithReturnType<object, TouchedEventArgs, bool> _touchDataEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool TouchDataCallbackType(IntPtr view, IntPtr touchData);
         private TouchDataCallbackType _touchDataCallback;
@@ -303,7 +303,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> Touch
+        public event EventHandlerWithReturnType<object, TouchedEventArgs, bool> Touched
         {
             add
             {
@@ -331,7 +331,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View TouchSignal
         private bool OnTouch(IntPtr view, IntPtr touchData)
         {
-            TouchEventArgs e = new TouchEventArgs();
+            TouchedEventArgs e = new TouchedEventArgs();
 
             e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(touchData);
 
@@ -346,7 +346,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Hover signal.
         /// </summary>
-        public class HoverEventArgs : EventArgs
+        public class HoveredEventArgs : EventArgs
         {
             private Hover _hover;
 
@@ -366,7 +366,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, HoverEventArgs, bool> _hoverEventHandler;
+        private EventHandlerWithReturnType<object, HoveredEventArgs, bool> _hoverEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool HoverEventCallbackType(IntPtr view, IntPtr hoverEvent);
         private HoverEventCallbackType _hoverEventCallback;
@@ -375,7 +375,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> Hover
+        public event EventHandlerWithReturnType<object, HoveredEventArgs, bool> Hovered
         {
             add
             {
@@ -403,7 +403,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View Hover signal
         private bool OnHoverEvent(IntPtr view, IntPtr hoverEvent)
         {
-            HoverEventArgs e = new HoverEventArgs();
+            HoveredEventArgs e = new HoveredEventArgs();
 
             e.Hover = Tizen.NUI.Hover.GetHoverFromPtr(hoverEvent);
 
@@ -418,7 +418,7 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Event arguments that passed via Wheel signal.
         /// </summary>
-        public class WheelEventArgs : EventArgs
+        public class WheelRolledEventArgs : EventArgs
         {
             private Wheel _wheel;
 
@@ -438,7 +438,7 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        private EventHandlerWithReturnType<object, WheelEventArgs, bool> _wheelEventHandler;
+        private EventHandlerWithReturnType<object, WheelRolledEventArgs, bool> _wheelEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate bool WheelEventCallbackType(IntPtr view, IntPtr wheelEvent);
         private WheelEventCallbackType _wheelEventCallback;
@@ -447,7 +447,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> WheelRoll
+        public event EventHandlerWithReturnType<object, WheelRolledEventArgs, bool> WheelRolled
         {
             add
             {
@@ -475,7 +475,7 @@ namespace Tizen.NUI.BaseComponents
         // Callback for View Wheel signal
         private bool OnWheelEvent(IntPtr view, IntPtr wheelEvent)
         {
-            WheelEventArgs e = new WheelEventArgs();
+            WheelRolledEventArgs e = new WheelRolledEventArgs();
 
             e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(wheelEvent);
 
index 5f035ed..b1cfcbc 100755 (executable)
@@ -363,7 +363,7 @@ namespace Tizen.NUI
         ///<summary>
         ///Event arguments that passed via FocusedViewEnterKey signal
         /// </summary>
-        public class FocusedViewEnterKeyEventArgs : EventArgs
+        public class FocusedViewActivatedEventArgs : EventArgs
         {
             private View _view;
 
@@ -380,7 +380,7 @@ namespace Tizen.NUI
             }
         }
 
-        private EventHandler<FocusedViewEnterKeyEventArgs> _focusedViewEnterKeyEventHandler;
+        private EventHandler<FocusedViewActivatedEventArgs> _focusedViewEnterKeyEventHandler;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void FocusedViewEnterKeyEventCallback(IntPtr view);
         private FocusedViewEnterKeyEventCallback _focusedViewEnterKeyEventCallback;
@@ -388,7 +388,7 @@ namespace Tizen.NUI
         /// <summary>
         /// FocusedViewActivated will be triggered when the current focused view has the enter key pressed on it.
         /// </summary>
-        public event EventHandler<FocusedViewEnterKeyEventArgs> FocusedViewActivated
+        public event EventHandler<FocusedViewActivatedEventArgs> FocusedViewActivated
         {
             add
             {
@@ -412,7 +412,7 @@ namespace Tizen.NUI
 
         private void OnFocusedViewEnterKey(IntPtr view)
         {
-            FocusedViewEnterKeyEventArgs e = new FocusedViewEnterKeyEventArgs();
+            FocusedViewActivatedEventArgs e = new FocusedViewActivatedEventArgs();
 
             e.View = View.GetViewFromPtr(view);
 
@@ -582,7 +582,7 @@ namespace Tizen.NUI
             View ret = new View(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             if (ret.HasBody() == false)
-            { 
+            {
                 return null;
             }
             return ret;
index 98b69be..e3c8072 100755 (executable)
@@ -92,7 +92,7 @@ namespace Tizen.NUI.UIComponents
         /// <summary>
         /// Event arguments that passed via OutsideTouchedEvent
         /// </summary>
-        public class OutsideTouchedEventArgs : EventArgs
+        public class TouchedOutsideEventArgs : EventArgs
         {
         }
 
@@ -126,7 +126,7 @@ namespace Tizen.NUI.UIComponents
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void OutsideTouchedEventCallbackDelegate();
-        private EventHandler<OutsideTouchedEventArgs> _popUpOutsideTouchedEventHandler;
+        private EventHandler<TouchedOutsideEventArgs> _popUpOutsideTouchedEventHandler;
         private OutsideTouchedEventCallbackDelegate _popUpOutsideTouchedEventCallbackDelegate;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -152,7 +152,7 @@ namespace Tizen.NUI.UIComponents
         /// <summary>
         /// Event is sent when user has touched outside of the Dialog.
         /// </summary>
-        public event EventHandler<OutsideTouchedEventArgs> OutsideTouched
+        public event EventHandler<TouchedOutsideEventArgs> TouchedOutside
         {
             add
             {
@@ -176,7 +176,7 @@ namespace Tizen.NUI.UIComponents
         // Callback for Popup OutsideTouchedSignal
         private void OnOutsideTouched()
         {
-            OutsideTouchedEventArgs e = new OutsideTouchedEventArgs();
+            TouchedOutsideEventArgs e = new TouchedOutsideEventArgs();
 
             if (_popUpOutsideTouchedEventHandler != null)
             {
index 3d2e887..44a2fe0 100755 (executable)
@@ -95,7 +95,7 @@ namespace Tizen.NUI.UIComponents
         /// <summary>
         /// Event arguments that passed via ScrollPositionIntervalReached event
         /// </summary>
-        public class ScrollPositionIntervalReachedEventArgs : EventArgs
+        public class ScrollIntervalEventArgs : EventArgs
         {
             private float _currentScrollPosition;
 
@@ -122,7 +122,7 @@ namespace Tizen.NUI.UIComponents
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void ScrollPositionIntervalReachedEventCallbackDelegate();
-        private EventHandler<ScrollPositionIntervalReachedEventArgs> _scrollBarScrollPositionIntervalReachedEventHandler;
+        private EventHandler<ScrollIntervalEventArgs> _scrollBarScrollPositionIntervalReachedEventHandler;
         private ScrollPositionIntervalReachedEventCallbackDelegate _scrollBarScrollPositionIntervalReachedEventCallbackDelegate;
 
         /// <summary>
@@ -165,7 +165,7 @@ namespace Tizen.NUI.UIComponents
         /// <summary>
         /// Event emitted when the current scroll position of the scrollable content
         /// </summary>
-        public event EventHandler<ScrollPositionIntervalReachedEventArgs> ScrollPositionIntervalReached
+        public event EventHandler<ScrollIntervalEventArgs> ScrollInterval
         {
             add
             {
@@ -189,7 +189,7 @@ namespace Tizen.NUI.UIComponents
         // Callback for ScrollBar ScrollPositionIntervalReachedSignal
         private void OnScrollBarScrollPositionIntervalReached()
         {
-            ScrollPositionIntervalReachedEventArgs e = new ScrollPositionIntervalReachedEventArgs();
+            ScrollIntervalEventArgs e = new ScrollIntervalEventArgs();
 
             if (_scrollBarScrollPositionIntervalReachedEventHandler != null)
             {
index d663877..68585f2 100755 (executable)
@@ -337,7 +337,7 @@ namespace Tizen.NUI
             return ret;
         }
 
-        public class WindowFocusChangedEventArgs : EventArgs
+        public class FocusChangedEventArgs : EventArgs
         {
             public bool FocusGained
             {
@@ -349,9 +349,9 @@ namespace Tizen.NUI
         private WindowFocusChangedEventCallbackType _windowFocusChangedEventCallback;
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void WindowFocusChangedEventCallbackType(bool focusGained);
-        private event EventHandler<WindowFocusChangedEventArgs> _windowFocusChangedEventHandler;
+        private event EventHandler<FocusChangedEventArgs> _windowFocusChangedEventHandler;
 
-        public event EventHandler<WindowFocusChangedEventArgs> WindowFocusChanged
+        public event EventHandler<FocusChangedEventArgs> FocusChanged
         {
             add
             {
@@ -376,7 +376,7 @@ namespace Tizen.NUI
 
         private void OnWindowFocusedChanged(bool focusGained)
         {
-            WindowFocusChangedEventArgs e = new WindowFocusChangedEventArgs();
+            FocusChangedEventArgs e = new FocusChangedEventArgs();
 
             e.FocusGained = focusGained;
 
@@ -834,7 +834,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Touch event argument.
         /// </summary>
-        public class TouchEventArgs : EventArgs
+        public class TouchedEventArgs : EventArgs
         {
             private Touch _touch;
 
@@ -854,7 +854,7 @@ namespace Tizen.NUI
             }
         }
 
-        private event EventHandler<TouchEventArgs> _stageTouchHandler;
+        private event EventHandler<TouchedEventArgs> _stageTouchHandler;
         private EventCallbackDelegateType1 _stageTouchCallbackDelegate;
 
         /// <summary>
@@ -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> Touch
+        public event EventHandler<TouchedEventArgs> Touched
         {
             add
             {
@@ -889,7 +889,7 @@ namespace Tizen.NUI
 
         private void OnStageTouch(IntPtr data)
         {
-            TouchEventArgs e = new TouchEventArgs();
+            TouchedEventArgs e = new TouchedEventArgs();
 
             if (data != null)
             {
@@ -905,7 +905,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Wheel event arguments.
         /// </summary>
-        public class WheelEventArgs : EventArgs
+        public class WheelRolledEventArgs : EventArgs
         {
             private Wheel _wheel;
 
@@ -925,13 +925,13 @@ namespace Tizen.NUI
             }
         }
 
-        private event EventHandler<WheelEventArgs> _stageWheelHandler;
+        private event EventHandler<WheelRolledEventArgs> _stageWheelHandler;
         private EventCallbackDelegateType1 _stageWheelCallbackDelegate;
 
         /// <summary>
         /// Event emitted when wheel event is received.
         /// </summary>
-        public event EventHandler<WheelEventArgs> WheelRoll
+        public event EventHandler<WheelRolledEventArgs> WheelRolled
         {
             add
             {
@@ -954,7 +954,7 @@ namespace Tizen.NUI
 
         private void OnStageWheel(IntPtr data)
         {
-            WheelEventArgs e = new WheelEventArgs();
+            WheelRolledEventArgs e = new WheelRolledEventArgs();
 
             if (data != null)
             {
@@ -996,7 +996,7 @@ namespace Tizen.NUI
         /// <summary>
         /// Event emitted when key event is received.
         /// </summary>
-        public event EventHandler<KeyEventArgs> Key
+        public event EventHandler<KeyEventArgs> KeyPressed
         {
             add
             {