From 9dfddd665f71ad1273799bfdd4fa6194b38d8bd9 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Mon, 12 Aug 2019 12:21:35 +0200 Subject: [PATCH] Version WPF --- AideDeJeu.sln | 59 +++- AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj | 285 ++++++++++++++++++ AideDeJeu/AideDeJeu.WPF/App.config | 30 ++ AideDeJeu/AideDeJeu.WPF/App.xaml | 9 + AideDeJeu/AideDeJeu.WPF/App.xaml.cs | 17 ++ AideDeJeu/AideDeJeu.WPF/MainWindow.xaml | 13 + AideDeJeu/AideDeJeu.WPF/MainWindow.xaml.cs | 35 +++ AideDeJeu/AideDeJeu.WPF/NativeAPI.cs | 127 ++++++++ AideDeJeu/AideDeJeu.WPF/OpenTK.dll.config | 25 ++ .../AideDeJeu.WPF/Properties/AssemblyInfo.cs | 55 ++++ .../Properties/Resources.Designer.cs | 71 +++++ .../AideDeJeu.WPF/Properties/Resources.resx | 117 +++++++ .../Properties/Settings.Designer.cs | 30 ++ .../Properties/Settings.settings | 7 + AideDeJeu/AideDeJeu.WPF/packages.config | 54 ++++ AideDeJeu/AideDeJeu/Views/DicesPage.xaml | 7 +- AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs | 2 +- 17 files changed, 936 insertions(+), 7 deletions(-) create mode 100644 AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj create mode 100644 AideDeJeu/AideDeJeu.WPF/App.config create mode 100644 AideDeJeu/AideDeJeu.WPF/App.xaml create mode 100644 AideDeJeu/AideDeJeu.WPF/App.xaml.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/MainWindow.xaml create mode 100644 AideDeJeu/AideDeJeu.WPF/MainWindow.xaml.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/NativeAPI.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/OpenTK.dll.config create mode 100644 AideDeJeu/AideDeJeu.WPF/Properties/AssemblyInfo.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/Properties/Resources.Designer.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/Properties/Resources.resx create mode 100644 AideDeJeu/AideDeJeu.WPF/Properties/Settings.Designer.cs create mode 100644 AideDeJeu/AideDeJeu.WPF/Properties/Settings.settings create mode 100644 AideDeJeu/AideDeJeu.WPF/packages.config diff --git a/AideDeJeu.sln b/AideDeJeu.sln index d398a04f..930b191b 100644 --- a/AideDeJeu.sln +++ b/AideDeJeu.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2037 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29201.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AideDeJeu.Android", "AideDeJeu\AideDeJeu.Android\AideDeJeu.Android.csproj", "{BDDAC482-955C-42BE-A907-1CC62EE8D51C}" EndProject @@ -28,6 +28,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AideDeJeuUnitTest", "AideDe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AideDeJeu.GTK", "AideDeJeu\AideDeJeu.GTK\AideDeJeu.GTK.csproj", "{F3173507-0CED-44BB-92D2-9DB7832FF011}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AideDeJeu.WPF", "AideDeJeu\AideDeJeu.WPF\AideDeJeu.WPF.csproj", "{F04CF57E-AFFD-44D0-BB02-6267C5ADC264}" + ProjectSection(ProjectDependencies) = postProject + {C0597D88-5C09-4314-80A3-64712B02D0E9} = {C0597D88-5C09-4314-80A3-64712B02D0E9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -145,6 +150,7 @@ Global {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.AppStore|x64.ActiveCfg = AppStore|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.AppStore|x86.ActiveCfg = AppStore|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|Any CPU.ActiveCfg = Debug|iPhone + {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|Any CPU.Build.0 = Debug|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|ARM.ActiveCfg = Debug|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|iPhone.ActiveCfg = Debug|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|iPhone.Build.0 = Debug|iPhone @@ -160,7 +166,6 @@ Global {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x64.ActiveCfg = Release|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x86.ActiveCfg = Release|iPhone - {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|Any CPU.Build.0 = Debug|iPhone {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86 {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Build.0 = Release|x86 {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86 @@ -461,6 +466,54 @@ Global {F3173507-0CED-44BB-92D2-9DB7832FF011}.Release|x64.Build.0 = Release|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Release|x86.ActiveCfg = Release|Any CPU {F3173507-0CED-44BB-92D2-9DB7832FF011}.Release|x86.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|ARM.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|x64.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Ad-Hoc|x86.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|Any CPU.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|ARM.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|ARM.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|iPhone.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|x64.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|x64.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|x86.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.AppStore|x86.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|ARM.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhone.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x64.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x64.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x86.ActiveCfg = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Debug|x86.Build.0 = Debug|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|Any CPU.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|ARM.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|ARM.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|iPhone.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|iPhone.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|x64.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|x64.Build.0 = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|x86.ActiveCfg = Release|Any CPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj new file mode 100644 index 00000000..46956303 --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj @@ -0,0 +1,285 @@ + + + + + + Debug + AnyCPU + {F04CF57E-AFFD-44D0-BB02-6267C5ADC264} + WinExe + AideDeJeu.WPF + AideDeJeu.WPF + v4.7.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\Markdig.0.17.1\lib\net40\Markdig.dll + + + ..\..\packages\Microsoft.Data.Sqlite.Core.2.0.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + + ..\..\packages\Microsoft.EntityFrameworkCore.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll + + + ..\..\packages\Microsoft.EntityFrameworkCore.Relational.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll + + + ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll + + + ..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll + + + ..\..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll + + + ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\..\packages\Microsoft.Extensions.Logging.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + + ..\..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + + ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + + ..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll + + + ..\..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll + + + ..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll + + + ..\..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll + + + ..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll + + + ..\..\packages\SkiaSharp.Views.1.68.0\lib\net45\SkiaSharp.Views.Desktop.dll + + + ..\..\packages\SkiaSharp.Views.Forms.1.68.0\lib\netstandard1.3\SkiaSharp.Views.Forms.dll + + + ..\..\packages\SkiaSharp.Views.1.68.0\lib\net45\SkiaSharp.Views.Gtk.dll + + + ..\..\packages\SkiaSharp.Views.1.68.0\lib\net45\SkiaSharp.Views.WPF.dll + + + ..\..\packages\sqlite-net-pcl.1.6.258-beta\lib\netstandard1.1\SQLite-net.dll + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.13\lib\net45\SQLitePCLRaw.batteries_green.dll + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.13\lib\net45\SQLitePCLRaw.batteries_v2.dll + + + ..\..\packages\SQLitePCLRaw.core.1.1.13\lib\net45\SQLitePCLRaw.core.dll + + + ..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.13\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll + + + + ..\..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll + + + ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + + ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll + + + ..\..\packages\System.Linq.4.1.0\lib\net463\System.Linq.dll + True + True + + + ..\..\packages\System.Linq.Expressions.4.1.0\lib\net463\System.Linq.Expressions.dll + True + True + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll + True + True + + + ..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll + True + True + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll + True + True + + + + + + + + + 4.0 + + + ..\..\packages\UrhoSharp.Forms.1.9.67\lib\netstandard2.0\UrhoSharp.Forms.dll + + + + + + ..\..\packages\Xamarin.Essentials.1.2.0\lib\netstandard2.0\Xamarin.Essentials.dll + + + ..\..\packages\Xamarin.Forms.4.1.0.673156\lib\netstandard2.0\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.4.1.0.673156\lib\netstandard2.0\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.Platform.WPF.4.1.0.673156\lib\net45\Xamarin.Forms.Platform.WPF.dll + + + ..\..\packages\Xamarin.Forms.4.1.0.673156\lib\netstandard2.0\Xamarin.Forms.Xaml.dll + + + ..\..\packages\YamlDotNet.6.1.2\lib\net45\YamlDotNet.dll + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + library.db + Always + + + library.ver + Always + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + {c0597d88-5c09-4314-80a3-64712b02d0e9} + AideDeJeu + + + + + + Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.WPF/App.config b/AideDeJeu/AideDeJeu.WPF/App.config new file mode 100644 index 00000000..7ee1edcd --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/App.config @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.WPF/App.xaml b/AideDeJeu/AideDeJeu.WPF/App.xaml new file mode 100644 index 00000000..1fbff88e --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/AideDeJeu/AideDeJeu.WPF/App.xaml.cs b/AideDeJeu/AideDeJeu.WPF/App.xaml.cs new file mode 100644 index 00000000..fdb18c29 --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace AideDeJeu.WPF +{ + /// + /// Logique d'interaction pour App.xaml + /// + public partial class App : Application + { + } +} diff --git a/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml b/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml new file mode 100644 index 00000000..6e2d94dd --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml @@ -0,0 +1,13 @@ + + + + + diff --git a/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml.cs b/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml.cs new file mode 100644 index 00000000..bd25afd4 --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/MainWindow.xaml.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using Xamarin.Forms; +using Xamarin.Forms.Platform.WPF; + +namespace AideDeJeu.WPF +{ + /// + /// Logique d'interaction pour MainWindow.xaml + /// + public partial class MainWindow : FormsApplicationPage + { + public MainWindow() + { + InitializeComponent(); + + Forms.Init(); + SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3()); + + LoadApplication(new AideDeJeu.App()); + } + } +} diff --git a/AideDeJeu/AideDeJeu.WPF/NativeAPI.cs b/AideDeJeu/AideDeJeu.WPF/NativeAPI.cs new file mode 100644 index 00000000..4559aa3c --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/NativeAPI.cs @@ -0,0 +1,127 @@ +using AideDeJeu.Tools; +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Threading.Tasks; + +[assembly: Xamarin.Forms.Dependency(typeof(AideDeJeu.WPF.Version_WPF))] +namespace AideDeJeu.WPF +{ + public class Version_WPF : INativeAPI + { + public string GetVersion() + { + //Package package = Package.Current; + //PackageId packageId = package.Id; + //PackageVersion version = packageId.Version; + + //return string.Format("{0}.{1}", version.Major, version.Minor); + return ""; + } + + public int GetBuild() + { + return 0; + } + + public async Task GetDatabasePathAsync(string databaseName) + { + var assembly = typeof(Version_WPF).GetTypeInfo().Assembly; + var path = AppDomain.CurrentDomain.BaseDirectory; // System.Reflection.Assembly.GetExecutingAssembly().CodeBase; + return Path.Combine(path, $"{databaseName}.db"); + //try + //{ + // if (await CheckDatabaseVersionAsync(databaseName)) + // { + // await CopyOldToNewFileAsync(databaseName, "db"); + // await CopyOldToNewFileAsync(databaseName, "ver"); + // } + //} + //catch + //{ + + //} + //return GetNewFilePath(databaseName, "db"); + } + + public Stream GetOldFileStream(string fileName, string extension) + { + var assembly = typeof(Version_WPF).GetTypeInfo().Assembly; + return assembly.GetManifestResourceStream($"AideDeJeu.WPF.{fileName}.{extension}"); + } + public string GetNewFilePath(string fileName, string extension) + { + var documentsDirectoryPath = "."; // Windows.Storage.ApplicationData.Current.LocalCacheFolder.Path; + return Path.Combine(documentsDirectoryPath, $"{fileName}.{extension}"); + } + public async Task CopyOldToNewFileAsync(string fileName, string extension) + { + using (var inStream = GetOldFileStream(fileName, extension)) + { + using (var outStream = new FileStream(GetNewFilePath(fileName, extension), FileMode.Create)) + { + await inStream.CopyToAsync(outStream); + } + } + } + + public async Task CheckDatabaseVersionAsync(string databaseName) + { + var path = GetNewFilePath(databaseName, "ver"); + if (!File.Exists(path)) + { + return true; + } + int newVersion = 0; + int oldVersion = -1; + using (var newStream = GetOldFileStream(databaseName, "ver")) + { + using (var sr = new StreamReader(newStream)) + { + var str = await sr.ReadToEndAsync(); + int.TryParse(str, out newVersion); + } + } + using (var oldStream = new FileStream(path, FileMode.Open)) + { + using (var sr = new StreamReader(oldStream)) + { + var str = await sr.ReadToEndAsync(); + int.TryParse(str, out oldVersion); + } + } + return newVersion > oldVersion; + } + + public async Task SaveStreamAsync(string filename, Stream stream) + { + using (var outStream = CreateStream(filename)) + { + await stream.CopyToAsync(outStream); + } + } + public Stream CreateStream(string filename) + { + var documentsDirectoryPath = "."; // Windows.Storage.ApplicationData.Current.LocalCacheFolder.Path; + var filepath = Path.Combine(documentsDirectoryPath, filename); + return new FileStream(filepath, FileMode.Create); + } + + public async Task LaunchFileAsync(string title, string message, string filePath) + { + try + { + if (!string.IsNullOrWhiteSpace(filePath)) + { + //StorageFile attachment = await StorageFile.GetFileFromPathAsync(filePath); + //var success = await Windows.System.Launcher.LaunchFileAsync(attachment); + } + } + finally + { + } + } + + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.WPF/OpenTK.dll.config b/AideDeJeu/AideDeJeu.WPF/OpenTK.dll.config new file mode 100644 index 00000000..7098d39e --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AideDeJeu/AideDeJeu.WPF/Properties/AssemblyInfo.cs b/AideDeJeu/AideDeJeu.WPF/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..292da322 --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// Les informations générales relatives à un assembly dépendent de +// l'ensemble d'attributs suivant. Pour modifier les informations +// associées à un assembly. +[assembly: AssemblyTitle("AideDeJeu.WPF")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("AideDeJeu.WPF")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly +// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de +// COM, affectez la valeur True à l'attribut ComVisible sur ce type. +[assembly: ComVisible(false)] + +//Pour commencer à générer des applications localisables, définissez +//CultureUtiliséePourCoder dans votre fichier .csproj +//dans . Par exemple, si vous utilisez le français +//dans vos fichiers sources, définissez à fr-FR. Puis, supprimez les marques de commentaire de +//l'attribut NeutralResourceLanguage ci-dessous. Mettez à jour "fr-FR" dans +//la ligne ci-après pour qu'elle corresponde au paramètre UICulture du fichier projet. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //où se trouvent les dictionnaires de ressources spécifiques à un thème + //(utilisé si une ressource est introuvable dans la page, + // ou dictionnaires de ressources de l'application) + ResourceDictionaryLocation.SourceAssembly //où se trouve le dictionnaire de ressources générique + //(utilisé si une ressource est introuvable dans la page, + // dans l'application ou dans l'un des dictionnaires de ressources spécifiques à un thème) +)] + + +// Les informations de version pour un assembly se composent des quatre valeurs suivantes : +// +// Version principale +// Version secondaire +// Numéro de build +// Révision +// +// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut +// en utilisant '*', comme indiqué ci-dessous : +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/AideDeJeu/AideDeJeu.WPF/Properties/Resources.Designer.cs b/AideDeJeu/AideDeJeu.WPF/Properties/Resources.Designer.cs new file mode 100644 index 00000000..cb6354ca --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 +// +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. +// +//------------------------------------------------------------------------------ + +namespace AideDeJeu.WPF.Properties +{ + + + /// + /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. + /// + // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder + // à l'aide d'un outil, tel que ResGen ou Visual Studio. + // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen + // avec l'option /str ou régénérez votre projet VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AideDeJeu.WPF.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Remplace la propriété CurrentUICulture du thread actuel pour toutes + /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/AideDeJeu/AideDeJeu.WPF/Properties/Resources.resx b/AideDeJeu/AideDeJeu.WPF/Properties/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.WPF/Properties/Settings.Designer.cs b/AideDeJeu/AideDeJeu.WPF/Properties/Settings.Designer.cs new file mode 100644 index 00000000..6810eb1e --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AideDeJeu.WPF.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/AideDeJeu/AideDeJeu.WPF/Properties/Settings.settings b/AideDeJeu/AideDeJeu.WPF/Properties/Settings.settings new file mode 100644 index 00000000..033d7a5e --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.WPF/packages.config b/AideDeJeu/AideDeJeu.WPF/packages.config new file mode 100644 index 00000000..422321ed --- /dev/null +++ b/AideDeJeu/AideDeJeu.WPF/packages.config @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml index e563845e..67978307 100644 --- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml @@ -6,7 +6,8 @@ xmlns:urho="clr-namespace:Urho.Forms;assembly=UrhoSharp.Forms" x:Class="AideDeJeu.Views.DicesPage" Appearing="ContentPage_Appearing" - Disappearing="ContentPage_Disappearing" Title="Dés" Visual="Material"> + Disappearing="ContentPage_Disappearing" Title="Dés" > + @@ -66,9 +67,9 @@ --> - +