X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fapplication-event.i;h=3050ae7fafbf7d6562dc169f035ffb3bb17e6893;hp=b6acb9d8038b4746d75626251e82c0d5b13d6754;hb=e457f551bb41cdab00e7dcf295b7aec1327c8ce7;hpb=a2519d330569f4898996dfcc74b8d30433bace42 diff --git a/plugins/dali-swig/SWIG/events/application-event.i b/plugins/dali-swig/SWIG/events/application-event.i index b6acb9d..3050ae7 100644 --- a/plugins/dali-swig/SWIG/events/application-event.i +++ b/plugins/dali-swig/SWIG/events/application-event.i @@ -21,10 +21,10 @@ using System.Runtime.InteropServices; /** - * @brief Event arguments that passed via AUIApplicationInit signal + * @brief Event arguments that passed via NUIApplicationInit signal * */ - public class AUIApplicationInitEventArgs : EventArgs + public class NUIApplicationInitEventArgs : EventArgs { private Application _application; @@ -46,10 +46,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationTerminate signal + * @brief Event arguments that passed via NUIApplicationTerminate signal * */ - public class AUIApplicationTerminateEventArgs : EventArgs + public class NUIApplicationTerminateEventArgs : EventArgs { private Application _application; /** @@ -70,10 +70,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationPause signal + * @brief Event arguments that passed via NUIApplicationPause signal * */ - public class AUIApplicationPauseEventArgs : EventArgs + public class NUIApplicationPauseEventArgs : EventArgs { private Application _application; /** @@ -94,10 +94,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationResume signal + * @brief Event arguments that passed via NUIApplicationResume signal * */ - public class AUIApplicationResumeEventArgs : EventArgs + public class NUIApplicationResumeEventArgs : EventArgs { private Application _application; /** @@ -118,10 +118,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationReset signal + * @brief Event arguments that passed via NUIApplicationReset signal * */ - public class AUIApplicationResetEventArgs : EventArgs + public class NUIApplicationResetEventArgs : EventArgs { private Application _application; /** @@ -142,10 +142,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationResize signal + * @brief Event arguments that passed via NUIApplicationResize signal * */ - public class AUIApplicationResizeEventArgs : EventArgs + public class NUIApplicationResizeEventArgs : EventArgs { private Application _application; /** @@ -166,10 +166,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationLanguageChanged signal + * @brief Event arguments that passed via NUIApplicationLanguageChanged signal * */ - public class AUIApplicationLanguageChangedEventArgs : EventArgs + public class NUIApplicationLanguageChangedEventArgs : EventArgs { private Application _application; /** @@ -190,10 +190,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationRegionChanged signal + * @brief Event arguments that passed via NUIApplicationRegionChanged signal * */ - public class AUIApplicationRegionChangedEventArgs : EventArgs + public class NUIApplicationRegionChangedEventArgs : EventArgs { private Application _application; /** @@ -214,10 +214,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationBatteryLow signal + * @brief Event arguments that passed via NUIApplicationBatteryLow signal * */ - public class AUIApplicationBatteryLowEventArgs : EventArgs + public class NUIApplicationBatteryLowEventArgs : EventArgs { private Application _application; /** @@ -238,10 +238,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationMemoryLow signal + * @brief Event arguments that passed via NUIApplicationMemoryLow signal * */ - public class AUIApplicationMemoryLowEventArgs : EventArgs + public class NUIApplicationMemoryLowEventArgs : EventArgs { private Application _application; /** @@ -262,10 +262,10 @@ } /** - * @brief Event arguments that passed via AUIApplicationAppControl signal + * @brief Event arguments that passed via NUIApplicationAppControl signal * */ - public class AUIApplicationAppControlEventArgs : EventArgs + public class NUIApplicationAppControlEventArgs : EventArgs { private Application _application; private IntPtr _voidp; @@ -308,69 +308,69 @@ %define APPLICATION_EVENTHANDLER_TYPEMAP_HELPER(NameSpace, ClassName) %typemap(cscode) NameSpace::ClassName %{ [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationInitEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationInitEventHandler; - private AUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate; + private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationInitEventHandler; + private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationTerminateEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationTerminateEventHandler; - private AUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate; + private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationTerminateEventHandler; + private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationPauseEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationPauseEventHandler; - private AUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate; + private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationPauseEventHandler; + private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationResumeEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationResumeEventHandler; - private AUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate; + private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationResumeEventHandler; + private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationResetEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationResetEventHandler; - private AUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate; + private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationResetEventHandler; + private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationResizeEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationResizeEventHandler; - private AUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate; + private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationResizeEventHandler; + private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationLanguageChangedEventHandler; - private AUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate; + private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationLanguageChangedEventHandler; + private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationRegionChangedEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationRegionChangedEventHandler; - private AUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate; + private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationRegionChangedEventHandler; + private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationBatteryLowEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationBatteryLowEventHandler; - private AUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate; + private delegate void NUIApplicationBatteryLowEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationBatteryLowEventHandler; + private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationMemoryLowEventCallbackDelegate(IntPtr application); - private DaliEventHandler _applicationMemoryLowEventHandler; - private AUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate; + private delegate void NUIApplicationMemoryLowEventCallbackDelegate(IntPtr application); + private DaliEventHandler _applicationMemoryLowEventHandler; + private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp); - private DaliEventHandler _applicationAppControlEventHandler; - private AUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate; + private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp); + private DaliEventHandler _applicationAppControlEventHandler; + private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate; /** * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationInitEventHandler - DaliEventHandler) + * (in the type of NUIApplicationInitEventHandler - DaliEventHandler) * provided by the user. Initialized signal is emitted when application is initialised */ - public event DaliEventHandler Initialized + public event DaliEventHandler Initialized { add { @@ -381,7 +381,7 @@ { _applicationInitEventHandler += value; - _applicationInitEventCallbackDelegate = new AUIApplicationInitEventCallbackDelegate(OnApplicationInit); + _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit); this.InitSignal().Connect(_applicationInitEventCallbackDelegate); } } @@ -404,9 +404,12 @@ // Callback for Application InitSignal private void OnApplicationInit(IntPtr data) { - AUIApplicationInitEventArgs e = new AUIApplicationInitEventArgs(); + // Initialize DisposeQueue Singleton class. This is also required to create DisposeQueue on main thread. + DisposeQueue.Instance.Initialize(); - // Populate all members of "e" (AUIApplicationInitEventArgs) with real data + NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs(); + + // Populate all members of "e" (NUIApplicationInitEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationInitEventHandler != null) @@ -418,10 +421,10 @@ /** * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationTerminateEventHandler-DaliEventHandler) + * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler) * provided by the user. Terminated signal is emitted when application is terminated */ - public event DaliEventHandler Terminated + public event DaliEventHandler Terminated { add { @@ -432,7 +435,7 @@ { _applicationTerminateEventHandler += value; - _applicationTerminateEventCallbackDelegate = new AUIApplicationTerminateEventCallbackDelegate(OnAUIApplicationTerminate); + _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate); this.TerminateSignal().Connect(_applicationTerminateEventCallbackDelegate); } } @@ -453,11 +456,11 @@ } // Callback for Application TerminateSignal - private void OnAUIApplicationTerminate(IntPtr data) + private void OnNUIApplicationTerminate(IntPtr data) { - AUIApplicationTerminateEventArgs e = new AUIApplicationTerminateEventArgs(); + NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs(); - // Populate all members of "e" (AUIApplicationTerminateEventArgs) with real data + // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationTerminateEventHandler != null) @@ -469,10 +472,10 @@ /** * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationPauseEventHandler-DaliEventHandler) + * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler) * provided by the user. Paused signal is emitted when application is paused */ - public event DaliEventHandler Paused + public event DaliEventHandler Paused { add { @@ -483,7 +486,7 @@ { _applicationPauseEventHandler += value; - _applicationPauseEventCallbackDelegate = new AUIApplicationPauseEventCallbackDelegate(OnAUIApplicationPause); + _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause); this.PauseSignal().Connect(_applicationPauseEventCallbackDelegate); } } @@ -504,11 +507,11 @@ } // Callback for Application PauseSignal - private void OnAUIApplicationPause(IntPtr data) + private void OnNUIApplicationPause(IntPtr data) { - AUIApplicationPauseEventArgs e = new AUIApplicationPauseEventArgs(); + NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs(); - // Populate all members of "e" (AUIApplicationPauseEventArgs) with real data + // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationPauseEventHandler != null) @@ -520,10 +523,10 @@ /** * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationResumeEventHandler-DaliEventHandler) + * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler) * provided by the user. Resumed signal is emitted when application is resumed */ - public event DaliEventHandler Resumed + public event DaliEventHandler Resumed { add { @@ -534,7 +537,7 @@ { _applicationResumeEventHandler += value; - _applicationResumeEventCallbackDelegate = new AUIApplicationResumeEventCallbackDelegate(OnAUIApplicationResume); + _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume); this.ResumeSignal().Connect(_applicationResumeEventCallbackDelegate); } } @@ -555,11 +558,11 @@ } // Callback for Application ResumeSignal - private void OnAUIApplicationResume(IntPtr data) + private void OnNUIApplicationResume(IntPtr data) { - AUIApplicationResumeEventArgs e = new AUIApplicationResumeEventArgs(); + NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs(); - // Populate all members of "e" (AUIApplicationResumeEventArgs) with real data + // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationResumeEventHandler != null) @@ -571,10 +574,10 @@ /** * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationResetEventHandler-DaliEventHandler) + * (in the type of NUIApplicationResetEventHandler-DaliEventHandler) * provided by the user. Reset signal is emitted when application is reset */ - public event DaliEventHandler Reset + public event DaliEventHandler Reset { add { @@ -585,7 +588,7 @@ { _applicationResetEventHandler += value; - _applicationResetEventCallbackDelegate = new AUIApplicationResetEventCallbackDelegate(OnAUIApplicationReset); + _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset); this.ResetSignal().Connect(_applicationResetEventCallbackDelegate); } } @@ -606,11 +609,11 @@ } // Callback for Application ResetSignal - private void OnAUIApplicationReset(IntPtr data) + private void OnNUIApplicationReset(IntPtr data) { - AUIApplicationResetEventArgs e = new AUIApplicationResetEventArgs(); + NUIApplicationResetEventArgs e = new NUIApplicationResetEventArgs(); - // Populate all members of "e" (AUIApplicationResetEventArgs) with real data + // Populate all members of "e" (NUIApplicationResetEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationResetEventHandler != null) @@ -622,10 +625,10 @@ /** * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationResizeEventHandler-DaliEventHandler) + * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler) * provided by the user. Resized signal is emitted when application is resized */ - public event DaliEventHandler Resized + public event DaliEventHandler Resized { add { @@ -636,7 +639,7 @@ { _applicationResizeEventHandler += value; - _applicationResizeEventCallbackDelegate = new AUIApplicationResizeEventCallbackDelegate(OnAUIApplicationResize); + _applicationResizeEventCallbackDelegate = new NUIApplicationResizeEventCallbackDelegate(OnNUIApplicationResize); this.ResizeSignal().Connect(_applicationResizeEventCallbackDelegate); } } @@ -657,11 +660,11 @@ } // Callback for Application ResizeSignal - private void OnAUIApplicationResize(IntPtr data) + private void OnNUIApplicationResize(IntPtr data) { - AUIApplicationResizeEventArgs e = new AUIApplicationResizeEventArgs(); + NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs(); - // Populate all members of "e" (AUIApplicationResizeEventArgs) with real data + // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationResizeEventHandler != null) @@ -673,10 +676,10 @@ /** * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationLanguageChangedEventHandler-DaliEventHandler) + * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler) * provided by the user. LanguageChanged signal is emitted when the region of the device is changed. */ - public event DaliEventHandler LanguageChanged + public event DaliEventHandler LanguageChanged { add { @@ -687,7 +690,7 @@ { _applicationLanguageChangedEventHandler += value; - _applicationLanguageChangedEventCallbackDelegate = new AUIApplicationLanguageChangedEventCallbackDelegate(OnAUIApplicationLanguageChanged); + _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged); this.LanguageChangedSignal().Connect(_applicationLanguageChangedEventCallbackDelegate); } } @@ -708,11 +711,11 @@ } // Callback for Application LanguageChangedSignal - private void OnAUIApplicationLanguageChanged(IntPtr data) + private void OnNUIApplicationLanguageChanged(IntPtr data) { - AUIApplicationLanguageChangedEventArgs e = new AUIApplicationLanguageChangedEventArgs(); + NUIApplicationLanguageChangedEventArgs e = new NUIApplicationLanguageChangedEventArgs(); - // Populate all members of "e" (AUIApplicationLanguageChangedEventArgs) with real data + // Populate all members of "e" (NUIApplicationLanguageChangedEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationLanguageChangedEventHandler != null) @@ -724,10 +727,10 @@ /** * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationRegionChangedEventHandler-DaliEventHandler) + * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler) * provided by the user. RegionChanged signal is emitted when the region of the device is changed. */ - public event DaliEventHandler RegionChanged + public event DaliEventHandler RegionChanged { add { @@ -738,7 +741,7 @@ { _applicationRegionChangedEventHandler += value; - _applicationRegionChangedEventCallbackDelegate = new AUIApplicationRegionChangedEventCallbackDelegate(OnAUIApplicationRegionChanged); + _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged); this.RegionChangedSignal().Connect(_applicationRegionChangedEventCallbackDelegate); } } @@ -759,11 +762,11 @@ } // Callback for Application RegionChangedSignal - private void OnAUIApplicationRegionChanged(IntPtr data) + private void OnNUIApplicationRegionChanged(IntPtr data) { - AUIApplicationRegionChangedEventArgs e = new AUIApplicationRegionChangedEventArgs(); + NUIApplicationRegionChangedEventArgs e = new NUIApplicationRegionChangedEventArgs(); - // Populate all members of "e" (AUIApplicationRegionChangedEventArgs) with real data + // Populate all members of "e" (NUIApplicationRegionChangedEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationRegionChangedEventHandler != null) @@ -775,10 +778,10 @@ /** * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationBatteryLowEventHandler-DaliEventHandler) + * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler) * provided by the user. BatteryLow signal is emitted when the battery level of the device is low. */ - public event DaliEventHandler BatteryLow + public event DaliEventHandler BatteryLow { add { @@ -789,7 +792,7 @@ { _applicationBatteryLowEventHandler += value; - _applicationBatteryLowEventCallbackDelegate = new AUIApplicationBatteryLowEventCallbackDelegate(OnAUIApplicationBatteryLow); + _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow); this.BatteryLowSignal().Connect(_applicationBatteryLowEventCallbackDelegate); } } @@ -810,11 +813,11 @@ } // Callback for Application BatteryLowSignal - private void OnAUIApplicationBatteryLow(IntPtr data) + private void OnNUIApplicationBatteryLow(IntPtr data) { - AUIApplicationBatteryLowEventArgs e = new AUIApplicationBatteryLowEventArgs(); + NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs(); - // Populate all members of "e" (AUIApplicationBatteryLowEventArgs) with real data + // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationBatteryLowEventHandler != null) @@ -826,10 +829,10 @@ /** * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationMemoryLowEventHandler-DaliEventHandler) + * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler) * provided by the user. MemoryLow signal is emitted when the memory level of the device is low. */ - public event DaliEventHandler MemoryLow + public event DaliEventHandler MemoryLow { add { @@ -840,7 +843,7 @@ { _applicationMemoryLowEventHandler += value; - _applicationMemoryLowEventCallbackDelegate = new AUIApplicationMemoryLowEventCallbackDelegate(OnAUIApplicationMemoryLow); + _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow); this.MemoryLowSignal().Connect(_applicationMemoryLowEventCallbackDelegate); } } @@ -861,11 +864,11 @@ } // Callback for Application MemoryLowSignal - private void OnAUIApplicationMemoryLow(IntPtr data) + private void OnNUIApplicationMemoryLow(IntPtr data) { - AUIApplicationMemoryLowEventArgs e = new AUIApplicationMemoryLowEventArgs(); + NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs(); - // Populate all members of "e" (AUIApplicationMemoryLowEventArgs) with real data + // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data e.Application = Application.GetApplicationFromPtr(data); if (_applicationMemoryLowEventHandler != null) @@ -877,10 +880,10 @@ /** * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler - * (in the type of AUIApplicationAppControlEventHandler-DaliEventHandler) + * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler) * provided by the user. AppControl signal is emitted when another application sends a launch request to the application. */ - public event DaliEventHandler AppControl + public event DaliEventHandler AppControl { add { @@ -891,7 +894,7 @@ { _applicationAppControlEventHandler += value; - _applicationAppControlEventCallbackDelegate = new AUIApplicationAppControlEventCallbackDelegate(OnAUIApplicationAppControl); + _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl); this.AppControlSignal().Connect(_applicationAppControlEventCallbackDelegate); } } @@ -912,11 +915,11 @@ } // Callback for Application AppControlSignal - private void OnAUIApplicationAppControl(IntPtr application, IntPtr voidp) + private void OnNUIApplicationAppControl(IntPtr application, IntPtr voidp) { - AUIApplicationAppControlEventArgs e = new AUIApplicationAppControlEventArgs(); + NUIApplicationAppControlEventArgs e = new NUIApplicationAppControlEventArgs(); - // Populate all members of "e" (AUIApplicationAppControlEventArgs) with real data + // Populate all members of "e" (NUIApplicationAppControlEventArgs) with real data e.Application = Application.GetApplicationFromPtr(application); e.VoidP = voidp; @@ -1018,6 +1021,9 @@ public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode) { + // register all Views with the type registry, so that can be created / styled via JSON + ViewRegistryHelper.Initialize(); + Application ret = New(1, stylesheet, windowMode); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -1028,16 +1034,6 @@ return ret; } - public bool AddIdle(System.Delegate func) { - System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); - System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip)); - - bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2)); - - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - %} %enddef