From a2d29e40e9bd5aa46e6b88ba10ca237a89dba977 Mon Sep 17 00:00:00 2001 From: Feng Jin Date: Mon, 17 Apr 2017 19:05:02 +0800 Subject: [PATCH] Manual merge for nui v0.2.35. Split namespace for UIComponents. Change-Id: I45951fb5b1e0f035b351df2fe70b0cf9376448fb Signed-off-by: Feng Jin --- .../NUISamples.TizenTV/examples/control-dashboard.cs | 1 + .../NUISamples.TizenTV/examples/custom-control.cs | 1 + .../NUISamples/NUISamples.TizenTV/examples/dali-test.cs | 1 + .../NUISamples.TizenTV/examples/flex-container.cs | 1 + .../NUISamples/NUISamples.TizenTV/examples/hello-test.cs | 1 + .../NUISamples/NUISamples.TizenTV/examples/hello-world.cs | 1 + .../NUISamples/NUISamples.TizenTV/examples/image-view.cs | 1 + .../NUISamples.TizenTV/examples/relative-vector.cs | 1 + .../NUISamples/NUISamples.TizenTV/examples/scroll-view.cs | 1 + NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs | 1 + .../NUISamples.TizenTV/examples/user-alphafunction.cs | 1 + .../NUISamples.TizenTV/examples/visual-animation-test.cs | 1 + .../NUISamples.TizenTV/examples/visual-view-test2.cs | 1 + .../visuals-using-custom-view/visuals-using-custom-view.cs | 1 + NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs | 1 + .../NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs | 1 + .../NUISamples.TizenTV/firstscreen/ScrollContainer.cs | 1 + Tizen.NUI/src/internal/ButtonSignal.cs | 4 ++-- Tizen.NUI/src/internal/KeyInputFocusManager.cs | 13 ------------- Tizen.NUI/src/internal/NDalicPINVOKE.cs | 6 ------ Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs | 4 ++-- Tizen.NUI/src/internal/SliderMarkReachedSignal.cs | 4 ++-- Tizen.NUI/src/internal/SliderValueChangedSignal.cs | 4 ++-- Tizen.NUI/src/internal/TextEditorSignal.cs | 4 ++-- Tizen.NUI/src/internal/TextFieldSignal.cs | 4 ++-- Tizen.NUI/src/internal/ToggleButton.cs | 2 +- Tizen.NUI/src/public/CustomView/Spin.cs | 1 + Tizen.NUI/src/public/{ => UIComponents}/Button.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/CheckBoxButton.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/ImageView.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/Popup.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/ProgressBar.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/PushButton.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/RadioButton.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/ScrollBar.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/Slider.cs | 2 +- Tizen.NUI/src/public/{ => UIComponents}/TextEditor.cs | 4 ++-- Tizen.NUI/src/public/{ => UIComponents}/TextField.cs | 6 +++--- Tizen.NUI/src/public/{ => UIComponents}/TextLabel.cs | 2 +- Tizen.NUI/src/public/VisualMaps.cs | 1 + 40 files changed, 47 insertions(+), 47 deletions(-) rename Tizen.NUI/src/public/{ => UIComponents}/Button.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/CheckBoxButton.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/ImageView.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/Popup.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/ProgressBar.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/PushButton.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/RadioButton.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/ScrollBar.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/Slider.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/TextEditor.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/TextField.cs (99%) rename Tizen.NUI/src/public/{ => UIComponents}/TextLabel.cs (99%) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs index 1b27bcc..1537252 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace ControlDashboard diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs index f75d817..49bf020 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs @@ -17,6 +17,7 @@ using System; using System.Runtime.InteropServices; +using Tizen.NUI.UIComponents; using Tizen.NUI; namespace CustomControlTest diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs index f06d1b2..e53faee 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace DaliTest diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs index e1b9ae4..0f334d9 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs @@ -1,6 +1,7 @@ using System; using Tizen.NUI; +using Tizen.NUI.UIComponents; namespace FlexContainerTest { diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs index c7ad1f6..22f513f 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; //using Tizen.Applications; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs index 76642a1..73e3771 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; using Tizen.NUI.Extension.Test; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs index 2c4654e..b62b79a 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace ImageViewTest diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs index 41ab502..234009e 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; //using Tizen.Applications; //------------------------------------------------------------------------------ diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs index 54216c2..d7db380 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace ScrollViewTest diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs index b2989c7..9fcb2ed 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs @@ -15,6 +15,7 @@ using System; using Tizen.NUI; +using Tizen.NUI.UIComponents; using System.Collections.Generic; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs index 4b84ac4..70e1d16 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace UserAlphaFunctionTest diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs index 4dd7cee..6574f2b 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs @@ -18,6 +18,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace VisaulAnimationExample diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs index 04984ba..021ac5e 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs @@ -1,5 +1,6 @@ using System; using Tizen.NUI; +using Tizen.NUI.UIComponents; namespace VisualViewTest2 { diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs index 034c403..bcc1ef2 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs @@ -17,6 +17,7 @@ using System; using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; namespace VisualsUsingCustomView diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs index af13db5..92fdfa8 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs @@ -1,4 +1,5 @@ using Tizen.NUI; +using Tizen.NUI.UIComponents; using System; using System.Runtime.InteropServices; using System.Collections.Generic; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs index a424703..eaa2e54 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs @@ -1,4 +1,5 @@ using Tizen.NUI; +using Tizen.NUI.UIComponents; using Tizen.NUI.Constants; using System; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs index a5129f5..804b0ee 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs @@ -1,5 +1,6 @@ using Tizen.NUI; using Tizen.NUI.Constants; +using Tizen.NUI.UIComponents; using System; using System.Runtime.InteropServices; using System.Collections.Generic; diff --git a/Tizen.NUI/src/internal/ButtonSignal.cs b/Tizen.NUI/src/internal/ButtonSignal.cs index 47e39df..886ebaf 100755 --- a/Tizen.NUI/src/internal/ButtonSignal.cs +++ b/Tizen.NUI/src/internal/ButtonSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Button arg) { - bool ret = NDalicPINVOKE.ButtonSignal_Emit(swigCPtr, Button.getCPtr(arg)); + public bool Emit(Tizen.NUI.UIComponents.Button arg) { + bool ret = NDalicPINVOKE.ButtonSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Button.getCPtr(arg)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/Tizen.NUI/src/internal/KeyInputFocusManager.cs index 29e6d69..467b88f 100755 --- a/Tizen.NUI/src/internal/KeyInputFocusManager.cs +++ b/Tizen.NUI/src/internal/KeyInputFocusManager.cs @@ -65,24 +65,11 @@ public class KeyInputFocusManager : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsKeyboardListener(View control) { - bool ret = NDalicPINVOKE.KeyInputFocusManager_IsKeyboardListener(swigCPtr, View.getCPtr(control)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() { SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(NDalicPINVOKE.KeyInputFocusManager_KeyInputFocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - internal KeyEventSignal UnhandledKeyEventSignal() { - KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.KeyInputFocusManager_UnhandledKeyEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } } diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index b2274c8..07fdd29 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -7124,15 +7124,9 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_RemoveFocus")] public static extern void KeyInputFocusManager_RemoveFocus(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_IsKeyboardListener")] - public static extern bool KeyInputFocusManager_IsKeyboardListener(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_KeyInputFocusChangedSignal")] public static extern global::System.IntPtr KeyInputFocusManager_KeyInputFocusChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_UnhandledKeyEventSignal")] - public static extern global::System.IntPtr KeyInputFocusManager_UnhandledKeyEventSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Alignment_Padding__SWIG_0")] public static extern global::System.IntPtr new_Alignment_Padding__SWIG_0(); diff --git a/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs b/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs index 1406298..275248a 100755 --- a/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs +++ b/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(ProgressBar arg1, float arg2, float arg3) { - NDalicPINVOKE.ProgressBarValueChangedSignal_Emit(swigCPtr, ProgressBar.getCPtr(arg1), arg2, arg3); + public void Emit(Tizen.NUI.UIComponents.ProgressBar arg1, float arg2, float arg3) { + NDalicPINVOKE.ProgressBarValueChangedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.ProgressBar.getCPtr(arg1), arg2, arg3); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs b/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs index 366bcb6..f5d3a62 100755 --- a/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs +++ b/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Slider arg1, int arg2) { - bool ret = NDalicPINVOKE.SliderMarkReachedSignal_Emit(swigCPtr, Slider.getCPtr(arg1), arg2); + public bool Emit(Tizen.NUI.UIComponents.Slider arg1, int arg2) { + bool ret = NDalicPINVOKE.SliderMarkReachedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Slider.getCPtr(arg1), arg2); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/Tizen.NUI/src/internal/SliderValueChangedSignal.cs b/Tizen.NUI/src/internal/SliderValueChangedSignal.cs index 67f5763..d22b923 100755 --- a/Tizen.NUI/src/internal/SliderValueChangedSignal.cs +++ b/Tizen.NUI/src/internal/SliderValueChangedSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Slider arg1, float arg2) { - bool ret = NDalicPINVOKE.SliderValueChangedSignal_Emit(swigCPtr, Slider.getCPtr(arg1), arg2); + public bool Emit(Tizen.NUI.UIComponents.Slider arg1, float arg2) { + bool ret = NDalicPINVOKE.SliderValueChangedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Slider.getCPtr(arg1), arg2); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/Tizen.NUI/src/internal/TextEditorSignal.cs b/Tizen.NUI/src/internal/TextEditorSignal.cs index c25e4de..b4528e1 100755 --- a/Tizen.NUI/src/internal/TextEditorSignal.cs +++ b/Tizen.NUI/src/internal/TextEditorSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(TextEditor arg) { - NDalicPINVOKE.TextEditorSignal_Emit(swigCPtr, TextEditor.getCPtr(arg)); + public void Emit(Tizen.NUI.UIComponents.TextEditor arg) { + NDalicPINVOKE.TextEditorSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.TextEditor.getCPtr(arg)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/Tizen.NUI/src/internal/TextFieldSignal.cs b/Tizen.NUI/src/internal/TextFieldSignal.cs index 8a2b623..3054900 100755 --- a/Tizen.NUI/src/internal/TextFieldSignal.cs +++ b/Tizen.NUI/src/internal/TextFieldSignal.cs @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(TextField arg) { - NDalicPINVOKE.TextFieldSignal_Emit(swigCPtr, TextField.getCPtr(arg)); + public void Emit(Tizen.NUI.UIComponents.TextField arg) { + NDalicPINVOKE.TextFieldSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.TextField.getCPtr(arg)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/Tizen.NUI/src/internal/ToggleButton.cs b/Tizen.NUI/src/internal/ToggleButton.cs index b3f5ad1..44e65bd 100755 --- a/Tizen.NUI/src/internal/ToggleButton.cs +++ b/Tizen.NUI/src/internal/ToggleButton.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { -public class ToggleButton : Button { +public class ToggleButton : Tizen.NUI.UIComponents.Button { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ToggleButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ToggleButton_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/Tizen.NUI/src/public/CustomView/Spin.cs b/Tizen.NUI/src/public/CustomView/Spin.cs index 1ab37b2..817eeca 100755 --- a/Tizen.NUI/src/public/CustomView/Spin.cs +++ b/Tizen.NUI/src/public/CustomView/Spin.cs @@ -19,6 +19,7 @@ using System; using System.Runtime.InteropServices; using Tizen.NUI; +using Tizen.NUI.UIComponents; // A spin control (for continously changing values when users can easily predict a set of values) diff --git a/Tizen.NUI/src/public/Button.cs b/Tizen.NUI/src/public/UIComponents/Button.cs similarity index 99% rename from Tizen.NUI/src/public/Button.cs rename to Tizen.NUI/src/public/UIComponents/Button.cs index 1202d09..3b9dd3c 100755 --- a/Tizen.NUI/src/public/Button.cs +++ b/Tizen.NUI/src/public/UIComponents/Button.cs @@ -16,7 +16,7 @@ // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts // Some have been manually changed -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; diff --git a/Tizen.NUI/src/public/CheckBoxButton.cs b/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs similarity index 99% rename from Tizen.NUI/src/public/CheckBoxButton.cs rename to Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs index 44c953a..3b057a5 100755 --- a/Tizen.NUI/src/public/CheckBoxButton.cs +++ b/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs @@ -16,7 +16,7 @@ // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts // Some have been manually changed -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { /// diff --git a/Tizen.NUI/src/public/ImageView.cs b/Tizen.NUI/src/public/UIComponents/ImageView.cs similarity index 99% rename from Tizen.NUI/src/public/ImageView.cs rename to Tizen.NUI/src/public/UIComponents/ImageView.cs index db6e756..7384d0e 100755 --- a/Tizen.NUI/src/public/ImageView.cs +++ b/Tizen.NUI/src/public/UIComponents/ImageView.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { /// diff --git a/Tizen.NUI/src/public/Popup.cs b/Tizen.NUI/src/public/UIComponents/Popup.cs similarity index 99% rename from Tizen.NUI/src/public/Popup.cs rename to Tizen.NUI/src/public/UIComponents/Popup.cs index 3b69235..f35ba4a 100755 --- a/Tizen.NUI/src/public/Popup.cs +++ b/Tizen.NUI/src/public/UIComponents/Popup.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; diff --git a/Tizen.NUI/src/public/ProgressBar.cs b/Tizen.NUI/src/public/UIComponents/ProgressBar.cs similarity index 99% rename from Tizen.NUI/src/public/ProgressBar.cs rename to Tizen.NUI/src/public/UIComponents/ProgressBar.cs index 316f746..e59df96 100755 --- a/Tizen.NUI/src/public/ProgressBar.cs +++ b/Tizen.NUI/src/public/UIComponents/ProgressBar.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; diff --git a/Tizen.NUI/src/public/PushButton.cs b/Tizen.NUI/src/public/UIComponents/PushButton.cs similarity index 99% rename from Tizen.NUI/src/public/PushButton.cs rename to Tizen.NUI/src/public/UIComponents/PushButton.cs index d5bb54e..a7bde36 100755 --- a/Tizen.NUI/src/public/PushButton.cs +++ b/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { /// diff --git a/Tizen.NUI/src/public/RadioButton.cs b/Tizen.NUI/src/public/UIComponents/RadioButton.cs similarity index 99% rename from Tizen.NUI/src/public/RadioButton.cs rename to Tizen.NUI/src/public/UIComponents/RadioButton.cs index 27af97e..e1f6c70 100755 --- a/Tizen.NUI/src/public/RadioButton.cs +++ b/Tizen.NUI/src/public/UIComponents/RadioButton.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { /// diff --git a/Tizen.NUI/src/public/ScrollBar.cs b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs similarity index 99% rename from Tizen.NUI/src/public/ScrollBar.cs rename to Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 045e1a0..46c07cc 100755 --- a/Tizen.NUI/src/public/ScrollBar.cs +++ b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; diff --git a/Tizen.NUI/src/public/Slider.cs b/Tizen.NUI/src/public/UIComponents/Slider.cs similarity index 99% rename from Tizen.NUI/src/public/Slider.cs rename to Tizen.NUI/src/public/UIComponents/Slider.cs index 6d7144f..1e0255f 100755 --- a/Tizen.NUI/src/public/Slider.cs +++ b/Tizen.NUI/src/public/UIComponents/Slider.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; diff --git a/Tizen.NUI/src/public/TextEditor.cs b/Tizen.NUI/src/public/UIComponents/TextEditor.cs similarity index 99% rename from Tizen.NUI/src/public/TextEditor.cs rename to Tizen.NUI/src/public/UIComponents/TextEditor.cs index bad5e3f..513cc6f 100755 --- a/Tizen.NUI/src/public/TextEditor.cs +++ b/Tizen.NUI/src/public/UIComponents/TextEditor.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; @@ -139,7 +139,7 @@ namespace Tizen.NUI TextChangedEventArgs e = new TextChangedEventArgs(); // Populate all members of "e" (TextChangedEventArgs) with real data - e.TextEditor = Tizen.NUI.TextEditor.GetTextEditorFromPtr(textEditor); + e.TextEditor = Tizen.NUI.UIComponents.TextEditor.GetTextEditorFromPtr(textEditor); if (_textEditorTextChangedEventHandler != null) { diff --git a/Tizen.NUI/src/public/TextField.cs b/Tizen.NUI/src/public/UIComponents/TextField.cs similarity index 99% rename from Tizen.NUI/src/public/TextField.cs rename to Tizen.NUI/src/public/UIComponents/TextField.cs index c8e4dba..6cd9ed3 100755 --- a/Tizen.NUI/src/public/TextField.cs +++ b/Tizen.NUI/src/public/UIComponents/TextField.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { using System; @@ -165,7 +165,7 @@ namespace Tizen.NUI TextChangedEventArgs e = new TextChangedEventArgs(); // Populate all members of "e" (TextChangedEventArgs) with real data - e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField); + e.TextField = Tizen.NUI.UIComponents.TextField.GetTextFieldFromPtr(textField); if (_textFieldTextChangedEventHandler != null) { @@ -204,7 +204,7 @@ namespace Tizen.NUI MaxLengthReachedEventArgs e = new MaxLengthReachedEventArgs(); // Populate all members of "e" (MaxLengthReachedEventArgs) with real data - e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField); + e.TextField = Tizen.NUI.UIComponents.TextField.GetTextFieldFromPtr(textField); if (_textFieldMaxLengthReachedEventHandler != null) { diff --git a/Tizen.NUI/src/public/TextLabel.cs b/Tizen.NUI/src/public/UIComponents/TextLabel.cs similarity index 99% rename from Tizen.NUI/src/public/TextLabel.cs rename to Tizen.NUI/src/public/UIComponents/TextLabel.cs index 834fbe0..2bfbb02 100755 --- a/Tizen.NUI/src/public/TextLabel.cs +++ b/Tizen.NUI/src/public/UIComponents/TextLabel.cs @@ -24,7 +24,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -namespace Tizen.NUI +namespace Tizen.NUI.UIComponents { /// diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs index e3b35b6..20d467b 100755 --- a/Tizen.NUI/src/public/VisualMaps.cs +++ b/Tizen.NUI/src/public/VisualMaps.cs @@ -17,6 +17,7 @@ namespace Tizen.NUI { using System; using System.Runtime.InteropServices; + using Tizen.NUI.UIComponents; /// /// A class encapsulating the transform map of visual. -- 2.7.4