Rename Events to Present tense

Change-Id: Ic796a73830b8414bdd03c8afe52d3ea89800c267

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
index 1e11b77..f3e7f90 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
@@ -79,7 +79,7 @@ namespace FlexContainerTest
             };
 
             //added
-            Window.Instance.Touched += (sender, e) =>
+            Window.Instance.Touch += (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]);

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
index 0d07c5c..adf5b0d 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
@@ -59,7 +59,7 @@ namespace HelloTest
         {
             // Connect the signal callback for window touched signal
             _window = Window.Instance;
-            _window.Touched += OnWindowTouched;
+            _window.Touch += OnWindowTouched;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
index 270a7d5..bead976 100755 (executable)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
@@ -53,8 +53,8 @@ namespace HelloWorldTest
         {
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.Touched += OnWindowTouched;
-            window.KeyEvent += OnWindowKeyEvent;
+            window.Touch += OnWindowTouched;
+            window.Key += OnWindowKeyEvent;
 
             TextLabel pixelLabel = new TextLabel("Test Pixel Size 32.0f");
             pixelLabel.Position2D = new Position2D(10, 10);

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
index 5d1787d..ceab16d 100755 (executable)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
@@ -63,9 +63,9 @@ namespace ImageViewTest
             Log("Customized Application Initialize event handler");
             window = Window.Instance;
             window.BackgroundColor = Color.Cyan;
-            window.Touched += OnWindowTouched;
-            window.WheelRolled += OnWindowWheelMoved;
-            window.KeyEvent += OnWindowKeyPressed;
+            window.Touch += OnWindowTouched;
+            window.WheelRoll += OnWindowWheelMoved;
+            window.Key += OnWindowKeyPressed;
             //window.EventProcessingFinished += OnWindowEventProcessingFinished;
 
             layer = window.GetDefaultLayer();

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
index becc3d2..86af43a 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
@@ -58,7 +58,7 @@ namespace RelativeVectorTest
         private void Initialize()
         {
             _window = Window.Instance;
-            _window.Touched += OnWindowTouched;
+            _window.Touch += OnWindowTouched;
 
             _imageView = new ImageView();
             _imageView.ResourceUrl = resources+"/images/gallery-3.jpg";

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
index cfb8432..d7d4d62 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
@@ -137,7 +137,7 @@ namespace ScrollViewTest
       // Connect to the OnRelayout signal
       _scrollView.Relayout += OnScrollViewRelayout;
       //_scrollView.Touched += OnTouch;
-      _scrollView.WheelRolled += Onwheel;
+      _scrollView.WheelRoll += Onwheel;
       _scrollView.FocusGained += OnKey;
       _text = new TextLabel("View Touch Event Handler Test");
       _text.ParentOrigin = ParentOrigin.Center;

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
index cb50761..bc3aad6 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
@@ -64,10 +64,10 @@ namespace UserAlphaFunctionTest
             Log("Initialize() is called!");
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.Touched += OnWindowTouched;
-            window.Touched += OnWindowTouched2;
+            window.Touch += OnWindowTouched;
+            window.Touch += OnWindowTouched2;
             //window.EventProcessingFinished += OnEventProcessingFinished;
-            window.WheelRolled += OnWindowWheelEvent;
+            window.WheelRoll += OnWindowWheelEvent;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
index a7612ed..e1f74e0 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
@@ -60,7 +60,7 @@ namespace MyCSharpExample
             FocusManager.Instance.SetCurrentFocusView(view[0]);
             FocusManager.Instance.PreFocusChange += Instance_PreFocusChange;
 
-            Window.Instance.Touched += Instance_Touch;
+            Window.Instance.Touch += Instance_Touch;
         }
 
         private void Instance_Touch(object sender, Window.TouchEventArgs e)

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
index 8ca1943..056ce47 100644 (file)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
@@ -137,9 +137,9 @@ namespace VisualViewTest2
                 "Enter - Change BG image\n";
             Window.Instance.Add(guide);
 
-            Window.Instance.KeyEvent += Instance_Key;
+            Window.Instance.Key += Instance_Key;
             FocusManager.Instance.SetCurrentFocusView(view[0]);
-            Window.Instance.Touched += Instance_Touch;
+            Window.Instance.Touch += Instance_Touch;
             _window = Window.Instance;
             _window.WindowFocusChanged += _window_WindowFocusChanged;
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index f9f63d6..5376481 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -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> Touched
+        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touch
         {
             add
             {
@@ -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> Hovered
+        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hover
         {
             add
             {
@@ -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> WheelRolled
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelRoll
         {
             add
             {

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index e2d05a7..d663877 100755 (executable)
--- 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
             {