diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/Aide.png b/JeuHoyEtudiants/JeuHoy_WPF_Natif/Aide.png deleted file mode 100644 index 02b7c9d..0000000 Binary files a/JeuHoyEtudiants/JeuHoy_WPF_Natif/Aide.png and /dev/null differ diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/AideTuto.png b/JeuHoyEtudiants/JeuHoy_WPF_Natif/AideTuto.png deleted file mode 100644 index da5cf65..0000000 Binary files a/JeuHoyEtudiants/JeuHoy_WPF_Natif/AideTuto.png and /dev/null differ diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/App.xaml b/JeuHoyEtudiants/JeuHoy_WPF_Natif/App.xaml index 7219ee2..2c881c0 100644 --- a/JeuHoyEtudiants/JeuHoy_WPF_Natif/App.xaml +++ b/JeuHoyEtudiants/JeuHoy_WPF_Natif/App.xaml @@ -1,8 +1,8 @@  + xmlns:local="clr-namespace:JeuHoy_WPF.View" + StartupUri="View/wEntree.xaml"> diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/Entrainement.png b/JeuHoyEtudiants/JeuHoy_WPF_Natif/Entrainement.png deleted file mode 100644 index 5ca4c07..0000000 Binary files a/JeuHoyEtudiants/JeuHoy_WPF_Natif/Entrainement.png and /dev/null differ diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/FondEntree.png b/JeuHoyEtudiants/JeuHoy_WPF_Natif/FondEntree.png deleted file mode 100644 index b6b1f01..0000000 Binary files a/JeuHoyEtudiants/JeuHoy_WPF_Natif/FondEntree.png and /dev/null differ diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JeuHoy_WPF_Natif.csproj b/JeuHoyEtudiants/JeuHoy_WPF_Natif/JeuHoy_WPF_Natif.csproj index fe0362f..400938d 100644 --- a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JeuHoy_WPF_Natif.csproj +++ b/JeuHoyEtudiants/JeuHoy_WPF_Natif/JeuHoy_WPF_Natif.csproj @@ -59,23 +59,23 @@ Designer - - - + + + App.xaml Code - + wAide.xaml - + wEntrainement.xaml - + wEntree.xaml - + wJeu.xaml @@ -107,8 +107,6 @@ - - PreserveNewest @@ -154,13 +152,6 @@ PreserveNewest - - - - - - - PreserveNewest @@ -180,19 +171,19 @@ PreserveNewest - PreserveNewest + Always PreserveNewest - PreserveNewest + Always - PreserveNewest + Always - PreserveNewest + Always PreserveNewest @@ -270,23 +261,23 @@ PreserveNewest - PreserveNewest + Always - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerHoy.png b/JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerHoy.png deleted file mode 100644 index 2ae57e0..0000000 Binary files a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerHoy.png and /dev/null differ diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/CstApplication.cs b/JeuHoyEtudiants/JeuHoy_WPF_Natif/Model/CstApplication.cs similarity index 100% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/CstApplication.cs rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/Model/CstApplication.cs diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerMp3.cs b/JeuHoyEtudiants/JeuHoy_WPF_Natif/Presenter/JouerMp3.cs similarity index 100% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerMp3.cs rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/Presenter/JouerMp3.cs diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerSon.cs b/JeuHoyEtudiants/JeuHoy_WPF_Natif/Presenter/JouerSon.cs similarity index 100% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/JouerSon.cs rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/Presenter/JouerSon.cs diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml similarity index 78% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml index 58056e1..a7241b5 100644 --- a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml +++ b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml @@ -1,14 +1,14 @@ - + Title="Jeu Hoy" Height="450" Width="800" WindowState="Maximized" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Icon="/Resources/téléchargement.jpg"> - + @@ -24,7 +24,7 @@ - + diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml.cs b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml.cs similarity index 98% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml.cs rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml.cs index 6609092..3879b83 100644 --- a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wAide.xaml.cs +++ b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wAide.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace JeuHoy_WPF +namespace JeuHoy_WPF.View { /// /// Auteur: Hugo St-Louis diff --git a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wEntrainement.xaml b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wEntrainement.xaml similarity index 88% rename from JeuHoyEtudiants/JeuHoy_WPF_Natif/wEntrainement.xaml rename to JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wEntrainement.xaml index 6b7f53f..a8e4669 100644 --- a/JeuHoyEtudiants/JeuHoy_WPF_Natif/wEntrainement.xaml +++ b/JeuHoyEtudiants/JeuHoy_WPF_Natif/View/wEntrainement.xaml @@ -1,4 +1,4 @@ - + Title="Jeu Hoy" Height="1024" Width="1368" WindowState="Maximized" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Icon="/Resources/téléchargement.jpg"> - + @@ -22,7 +22,7 @@ - + @@ -40,7 +40,7 @@