Change all "inputfocus" & "keyboardfocus" to "focus"

Change all the name which have "inputfocus" or "keyboardfocus".

Change-Id: Iaa18b1d2635a13edab9fc0510dfaaf2bdc45bdd7
Signed-off-by: minho.sun <minho.sun@samsung.com>

diff --git a/Tizen.NUI/src/internal/ViewImpl.cs b/Tizen.NUI/src/internal/ViewImpl.cs
index e11ab3a..858deea 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewImpl.cs
+++ b/Tizen.NUI/src/internal/ViewImpl.cs
@@ -171,13 +171,13 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public void SetAsKeyboardFocusGroup(bool isFocusGroup)
+        public void SetAsFocusGroup(bool isFocusGroup)
         {
             NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public bool IsKeyboardFocusGroup()
+        public bool IsFocusGroup()
         {
             bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -431,16 +431,16 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled)
+        public virtual Actor GetNextFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled)
         {
-            Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);
+            Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
 
-        public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
+        public virtual void OnFocusChangeCommitted(Actor commitedFocusableActor)
         {
-            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));
+            if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -553,9 +553,9 @@ namespace Tizen.NUI
                 swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained);
             if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31))
                 swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost);
-            if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32))
+            if (SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes32))
                 swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor);
-            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33))
+            if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33))
                 swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted);
             if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34))
                 swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter);
@@ -755,12 +755,12 @@ namespace Tizen.NUI
 
         private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)
         {
-            return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle;
+            return Actor.getCPtr(GetNextFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle;
         }
 
         private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor)
         {
-            OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, true));
+            OnFocusChangeCommitted(new Actor(commitedFocusableActor, true));
         }
 
         private bool SwigDirectorOnKeyboardEnter()

diff --git a/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/Tizen.NUI/src/internal/ViewWrapperImpl.cs
index 5342294..39735de 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewWrapperImpl.cs
+++ b/Tizen.NUI/src/internal/ViewWrapperImpl.cs
@@ -49,10 +49,10 @@ namespace Tizen.NUI
         public delegate bool OnAccessibilityTouchDelegate(Touch touch);
         public delegate bool OnAccessibilityValueChangeDelegate(bool isIncrease);
         public delegate bool OnAccessibilityZoomDelegate();
-        public delegate void OnKeyInputFocusGainedDelegate();
-        public delegate void OnKeyInputFocusLostDelegate();
-        public delegate View GetNextKeyboardFocusableViewDelegate(View currentFocusedView, View.FocusDirection direction, bool loopEnabled);
-        public delegate void OnKeyboardFocusChangeCommittedDelegate(View commitedFocusableView);
+        public delegate void OnFocusGainedDelegate();
+        public delegate void OnFocusLostDelegate();
+        public delegate View GetNextFocusableViewDelegate(View currentFocusedView, View.FocusDirection direction, bool loopEnabled);
+        public delegate void OnFocusChangeCommittedDelegate(View commitedFocusableView);
         public delegate bool OnKeyboardEnterDelegate();
         public delegate void OnPinchDelegate(PinchGesture pinch);
         public delegate void OnPanDelegate(PanGesture pan);
@@ -88,10 +88,10 @@ namespace Tizen.NUI
         public OnAccessibilityTouchDelegate OnAccessibilityTouch;
         public OnAccessibilityValueChangeDelegate OnAccessibilityValueChange;
         public OnAccessibilityZoomDelegate OnAccessibilityZoom;
-        public OnKeyInputFocusGainedDelegate OnKeyInputFocusGained;
-        public OnKeyInputFocusLostDelegate OnKeyInputFocusLost;
-        public GetNextKeyboardFocusableViewDelegate GetNextKeyboardFocusableView;
-        public OnKeyboardFocusChangeCommittedDelegate OnKeyboardFocusChangeCommitted;
+        public OnFocusGainedDelegate OnFocusGained;
+        public OnFocusLostDelegate OnFocusLost;
+        public GetNextFocusableViewDelegate GetNextFocusableView;
+        public OnFocusChangeCommittedDelegate OnFocusChangeCommitted;
         public OnKeyboardEnterDelegate OnKeyboardEnter;
         public OnPinchDelegate OnPinch;
         public OnPanDelegate OnPan;
@@ -230,7 +230,7 @@ namespace Tizen.NUI
             return ret;
         }
 
-        public void EmitKeyInputFocusSignal(bool focusGained)
+        public void EmitFocusSignal(bool focusGained)
         {
             NDalicManualPINVOKE.ViewWrapperImpl_EmitKeyInputFocusSignal(swigCPtr, focusGained);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -274,10 +274,10 @@ namespace Tizen.NUI
             Delegate27 = new DelegateViewWrapperImpl_27(DirectorOnAccessibilityTouch);
             Delegate28 = new DelegateViewWrapperImpl_28(DirectorOnAccessibilityValueChange);
             Delegate29 = new DelegateViewWrapperImpl_29(DirectorOnAccessibilityZoom);
-            Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnKeyInputFocusGained);
-            Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnKeyInputFocusLost);
-            Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextKeyboardFocusableActor);
-            Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnKeyboardFocusChangeCommitted);
+            Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnFocusGained);
+            Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnFocusLost);
+            Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextFocusableActor);
+            Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnFocusChangeCommitted);
             Delegate34 = new DelegateViewWrapperImpl_34(DirectorOnKeyboardEnter);
             Delegate35 = new DelegateViewWrapperImpl_35(DirectorOnPinch);
             Delegate36 = new DelegateViewWrapperImpl_36(DirectorOnPan);
@@ -441,24 +441,24 @@ namespace Tizen.NUI
             return OnAccessibilityZoom();
         }
 
-        private void DirectorOnKeyInputFocusGained()
+        private void DirectorOnFocusGained()
         {
-            OnKeyInputFocusGained();
+            OnFocusGained();
         }
 
-        private void DirectorOnKeyInputFocusLost()
+        private void DirectorOnFocusLost()
         {
-            OnKeyInputFocusLost();
+            OnFocusLost();
         }
 
-        private global::System.IntPtr DirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)
+        private global::System.IntPtr DirectorGetNextFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)
         {
-            return Actor.getCPtr(GetNextKeyboardFocusableView(new View(currentFocusedActor, false), (View.FocusDirection)direction, loopEnabled)).Handle;
+            return Actor.getCPtr(GetNextFocusableView(new View(currentFocusedActor, false), (View.FocusDirection)direction, loopEnabled)).Handle;
         }
 
-        private void DirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableView)
+        private void DirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableView)
         {
-            OnKeyboardFocusChangeCommitted(new View(commitedFocusableView, false));
+            OnFocusChangeCommitted(new View(commitedFocusableView, false));
         }
 
         private bool DirectorOnKeyboardEnter()

diff --git a/Tizen.NUI/src/public/CustomView.cs b/Tizen.NUI/src/public/CustomView.cs
index 7f2acf5..2e31f85 100755 (executable)
--- a/Tizen.NUI/src/public/CustomView.cs
+++ b/Tizen.NUI/src/public/CustomView.cs
@@ -54,10 +54,10 @@ namespace Tizen.NUI
             viewWrapperImpl.OnAccessibilityTouch = new ViewWrapperImpl.OnAccessibilityTouchDelegate(OnAccessibilityTouch);
             viewWrapperImpl.OnAccessibilityValueChange = new ViewWrapperImpl.OnAccessibilityValueChangeDelegate(OnAccessibilityValueChange);
             viewWrapperImpl.OnAccessibilityZoom = new ViewWrapperImpl.OnAccessibilityZoomDelegate(OnAccessibilityZoom);
-            viewWrapperImpl.OnKeyInputFocusGained = new ViewWrapperImpl.OnKeyInputFocusGainedDelegate(OnKeyInputFocusGained);
-            viewWrapperImpl.OnKeyInputFocusLost = new ViewWrapperImpl.OnKeyInputFocusLostDelegate(OnKeyInputFocusLost);
-            viewWrapperImpl.GetNextKeyboardFocusableView = new ViewWrapperImpl.GetNextKeyboardFocusableViewDelegate(GetNextKeyboardFocusableView);
-            viewWrapperImpl.OnKeyboardFocusChangeCommitted = new ViewWrapperImpl.OnKeyboardFocusChangeCommittedDelegate(OnKeyboardFocusChangeCommitted);
+            viewWrapperImpl.OnFocusGained = new ViewWrapperImpl.OnFocusGainedDelegate(OnFocusGained);
+            viewWrapperImpl.OnFocusLost = new ViewWrapperImpl.OnFocusLostDelegate(OnFocusLost);
+            viewWrapperImpl.GetNextFocusableView = new ViewWrapperImpl.GetNextFocusableViewDelegate(GetNextFocusableView);
+            viewWrapperImpl.OnFocusChangeCommitted = new ViewWrapperImpl.OnFocusChangeCommittedDelegate(OnFocusChangeCommitted);
             viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyboardEnter);
             viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch);
             viewWrapperImpl.OnPan = new ViewWrapperImpl.OnPanDelegate(OnPan);
@@ -171,7 +171,7 @@ namespace Tizen.NUI
          */
         internal void SetAsKeyboardFocusGroup(bool isFocusGroup)
         {
-            viewWrapperImpl.SetAsKeyboardFocusGroup(isFocusGroup);
+            viewWrapperImpl.SetAsFocusGroup(isFocusGroup);
         }
 
         /**
@@ -181,7 +181,7 @@ namespace Tizen.NUI
          */
         internal bool IsKeyboardFocusGroup()
         {
-            return viewWrapperImpl.IsKeyboardFocusGroup();
+            return viewWrapperImpl.IsFocusGroup();
         }
 
         /**
@@ -374,9 +374,9 @@ namespace Tizen.NUI
          *
          * @param[in] focusGained True if gained, False if lost
          */
-        protected void EmitKeyInputFocusSignal(bool focusGained)
+        protected void EmitFocusSignal(bool focusGained)
         {
-            viewWrapperImpl.EmitKeyInputFocusSignal(focusGained);
+            viewWrapperImpl.EmitFocusSignal(focusGained);
         }
 
         /**
@@ -726,7 +726,7 @@ namespace Tizen.NUI
          *
          * @return true if the zoom action has been consumed by this control
          */
-        public virtual void OnKeyInputFocusGained()
+        public virtual void OnFocusGained()
         {
         }
 
@@ -735,7 +735,7 @@ namespace Tizen.NUI
          *
          * Should be overridden by derived classes if they need to customize what happens when focus is lost.
          */
-        public virtual void OnKeyInputFocusLost()
+        public virtual void OnFocusLost()
         {
         }
 
@@ -748,7 +748,7 @@ namespace Tizen.NUI
          * @param[in] loopEnabled Whether the focus movement should be looped within the control.
          * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.
          */
-        public virtual View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
+        public virtual View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
         {
             return new View();
         }
@@ -761,7 +761,7 @@ namespace Tizen.NUI
          *
          * @param[in] commitedFocusableActor The commited focusable actor.
          */
-        public virtual void OnKeyboardFocusChangeCommitted(View commitedFocusableView)
+        public virtual void OnFocusChangeCommitted(View commitedFocusableView)
         {
         }
 

diff --git a/Tizen.NUI/src/public/CustomView/Spin.cs b/Tizen.NUI/src/public/CustomView/Spin.cs
index 87ad1b1..d85478e 100755 (executable)
--- a/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/Tizen.NUI/src/public/CustomView/Spin.cs
@@ -163,7 +163,7 @@ namespace Tizen.NUI
         /// <param name="direction">The direction to move the focus towards</param>
         /// <param name="loopEnabled">Whether the focus movement should be looped within the control</param>
         /// <returns>The next keyboard focusable view in this control or an empty handle if no view can be focused</returns>
-        public override View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
+        public override View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
         {
             // Respond to Up/Down keys to change the value while keeping the current spin focused
             View nextFocusedView = currentFocusedView;