From: dongsug.song Date: Tue, 13 Jun 2017 07:43:04 +0000 (+0900) Subject: Revert "[Tizen] nui 0.2.41 release" X-Git-Tag: preview1-00180^2~254 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24233b32e1c4ed115ad5eccc20bc0d14d05eb34f;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Revert "[Tizen] nui 0.2.41 release" This reverts commit 4c6ba66c632eeaf5f83771e4874f8026d1e7987c. Change-Id: I968fa4c35d4a038c2ab98ef84511d37f56bb8213 --- diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs index 778e34ae9..a2e21d81b 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs @@ -240,7 +240,7 @@ namespace TizenVDUIApplication19 //This function is called when the app exit normally. base.OnTerminate(); } -/* + protected override void OnLowMemory(LowMemoryEventArgs e) { //This function is called when the system is low on memory. @@ -252,7 +252,7 @@ namespace TizenVDUIApplication19 //This function is called when the language is changed. base.OnLocaleChanged(e); } -*/ + private static void _Main(string[] args) { //Create an Application diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs index d5cf65a73..dfdb90d67 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs @@ -50,12 +50,12 @@ namespace TTSPlayerTest ttsPlayer.StateChanged += (s, e) => { - Tizen.Log.Debug("NUI", "TTS state changed!!!"); + Tizen.Log.Debug("TTS state changed!!!"); }; ttsPlayer.Pause(); ttsPlayer.Resume(); ttsPlayer.Stop(); - Tizen.Log.Debug("NUI", "TTS state: " + ttsPlayer.GetState()); + Tizen.Log.Debug("TTS state: " + ttsPlayer.GetState()); } [STAThread] diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs old mode 100755 new mode 100644 index 3e80a2e56..f2fef89aa --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs @@ -265,7 +265,7 @@ namespace VisualViewTest { cnt++; Tizen.Log.Debug("NUI", "[WindowFocusTest] WindowFocusChanged event comes! focus gained=" + ee.FocusGained); - imageVisualMap1.Size += new Size2D(50, 50); + imageVisualMap1.Size += new Vector2(50.0f, 50.0f); imageVisualMap1.Position += new Vector2(20.0f, 20.0f); textVisualMap1.Text = "Hello Goodbye" + cnt; diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index b1d3646b8..fdd56f9c8 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,6 +1,6 @@ Name: csapi-nui Summary: dali-NUI -Version: 0.2.41 +Version: 0.2.39 Release: 1 Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause and MIT diff --git a/src/Tizen.NUI/Properties/AssemblyInfo.cs b/src/Tizen.NUI/Properties/AssemblyInfo.cs index f8c7f4fe3..e55d1f6d0 100755 --- a/src/Tizen.NUI/Properties/AssemblyInfo.cs +++ b/src/Tizen.NUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.41.0531")] -[assembly: AssemblyFileVersion("0.2.41.0531")] +[assembly: AssemblyVersion("0.2.39.0519")] +[assembly: AssemblyFileVersion("0.2.39.0519")] diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index 1826c5fad..422857d93 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -19,10 +19,10 @@ namespace Tizen.NUI { public const int ver1 = 1; public const int ver2 = 2; - public const int ver3 = 41; + public const int ver3 = 39; public const int nuiVer1 = 0; public const int nuiVer2 = 2; - public const int nuiVer3 = 41; + public const int nuiVer3 = 39; public const string nuiRelease = ""; }