From: Jean-Philippe Bruyère Date: Fri, 2 Aug 2019 23:43:18 +0000 (+0200) Subject: update packages X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=6f7ff851989c9472241eb2028ad153e06f24a1f7;p=jp%2Fcrow.git update packages --- diff --git a/Crow.sln b/Crow.sln index 7101b710..2bb604eb 100644 --- a/Crow.sln +++ b/Crow.sln @@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShowCase", "Samples\ShowCas EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Samples\Tests\Tests.csproj", "{5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrowIDE", "Samples\CrowIDE\CrowIDE.csproj", "{232046EE-C7B3-42CD-9EED-8E3A35097C42}" +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "CrowIDE", "Samples\CrowIDE\CrowIDE.csproj", "{B10C0B1B-B827-45E0-B96D-DAB6A22CE776}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -24,19 +24,19 @@ Global {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.Build.0 = Release|Any CPU {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Release|Any CPU.ActiveCfg = Release|Any CPU {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Release|Any CPU.Build.0 = Release|Any CPU + {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {56329D48-D382-4850-93DE-59C453894E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56329D48-D382-4850-93DE-59C453894E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {56329D48-D382-4850-93DE-59C453894E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {56329D48-D382-4850-93DE-59C453894E8A}.Release|Any CPU.Build.0 = Release|Any CPU {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Release|Any CPU.Build.0 = Release|Any CPU - {232046EE-C7B3-42CD-9EED-8E3A35097C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {232046EE-C7B3-42CD-9EED-8E3A35097C42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B10C0B1B-B827-45E0-B96D-DAB6A22CE776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B10C0B1B-B827-45E0-B96D-DAB6A22CE776}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 @@ -81,6 +81,6 @@ Global {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6} {56329D48-D382-4850-93DE-59C453894E8A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6} {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6} - {232046EE-C7B3-42CD-9EED-8E3A35097C42} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6} + {B10C0B1B-B827-45E0-B96D-DAB6A22CE776} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6} EndGlobalSection EndGlobal diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj index db18440f..48374a19 100644 --- a/Crow/Crow.csproj +++ b/Crow/Crow.csproj @@ -12,7 +12,8 @@ false Jean-Philippe Bruyère - C# Rapid Open Widget Toolkit + C# Rapid Open Widget Toolkit + MIT Crow.VK Crow Vulkan Widget Interface GUI $(AssemblyVersion)-beta @@ -33,7 +34,7 @@ full - TRACE;DESIGN_MODE;DEBUG;NETFRAMEWORK;NET471 + TRACE;DESIGN_MODE;_DEBUG_CLIP_RECTANGLE;DEBUG;NETFRAMEWORK;NET471 true @@ -64,6 +65,6 @@ - + diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj index ed3e9803..5b4cb671 100644 --- a/Samples/HelloWorld/HelloWorld.csproj +++ b/Samples/HelloWorld/HelloWorld.csproj @@ -29,6 +29,6 @@ - + diff --git a/Samples/HelloWorld/main.cs b/Samples/HelloWorld/main.cs index 9465f713..fb9ef304 100644 --- a/Samples/HelloWorld/main.cs +++ b/Samples/HelloWorld/main.cs @@ -5,10 +5,16 @@ namespace HelloWorld class Program : CrowVkWin { static void Main (string[] args) { using (Program vke = new Program ()) { - vke.crow.Load ("#HelloWorld.helloworld.crow").DataSource = vke; vke.Run (); } } + protected override void onLoad () + { + base.onLoad (); + + crow.Load ("#HelloWorld.helloworld.crow"); + } + } } diff --git a/Samples/ShowCase/ShowCase.csproj b/Samples/ShowCase/ShowCase.csproj index 610ed694..a0e6528b 100644 --- a/Samples/ShowCase/ShowCase.csproj +++ b/Samples/ShowCase/ShowCase.csproj @@ -5,7 +5,7 @@ $(SolutionDir)build\$(Configuration)\ Exe https://github.com/jpbruyere/Crow - https://opensource.org/licenses/MIT + MIT true false net471 @@ -23,7 +23,7 @@ - + @@ -40,6 +40,6 @@ - + diff --git a/Samples/Tests/Tests.csproj b/Samples/Tests/Tests.csproj index 0382c938..9b264e05 100644 --- a/Samples/Tests/Tests.csproj +++ b/Samples/Tests/Tests.csproj @@ -35,7 +35,7 @@ - + diff --git a/Samples/Tests/main.cs b/Samples/Tests/main.cs index 5f2e6b65..97511c32 100644 --- a/Samples/Tests/main.cs +++ b/Samples/Tests/main.cs @@ -147,7 +147,7 @@ namespace HelloWorld //testFiles = new string [] { @"Interfaces/Experimental/testDock.crow" }; testFiles = new string [] { @"Interfaces/Divers/welcome.crow" }; - //testFiles = new string [] { @"Interfaces/Divers/colorPicker.crow" }; + //testFiles = new string [] { @"Interfaces/Divers/0.crow" }; testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray (); @@ -187,9 +187,11 @@ namespace HelloWorld else if (idx < 0) idx = testFiles.Length - 1; + Console.WriteLine ($"loading: {testFiles [idx]}"); try { Widget w = crow.Load (testFiles [idx]); w.DataSource = this; + } catch (Exception ex) { MessageBox.Show (crow, MessageBox.Type.Error, ex.Message + "\n" + ex.InnerException.Message).Modal = true; }