From ee7d50c60ba755f1d8591a20085883f3f57fd881 Mon Sep 17 00:00:00 2001
From: majean5 <Mathilde.JEAN3@etu.uca.fr>
Date: Fri, 15 Apr 2022 11:50:29 +0200
Subject: [PATCH] Dictionnaire ressources style

---
 Ressources/Class1.cs          |  8 ++++++++
 Ressources/Dictionnaire.xaml  | 21 +++++++++++++++++++++
 Ressources/Ressources.csproj  |  8 ++++++++
 WpfApp1.sln                   |  6 ++++++
 WpfApp1/AddAShark.xaml        |  8 ++++----
 WpfApp1/App.xaml              |  6 +++++-
 WpfApp1/MainWindow.xaml       | 14 ++++----------
 WpfApp1/UserControlBoite.xaml |  2 +-
 WpfApp1/WpfApp1.csproj        |  4 ++++
 9 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 Ressources/Class1.cs
 create mode 100644 Ressources/Dictionnaire.xaml
 create mode 100644 Ressources/Ressources.csproj

diff --git a/Ressources/Class1.cs b/Ressources/Class1.cs
new file mode 100644
index 0000000..8995908
--- /dev/null
+++ b/Ressources/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Ressources
+{
+    public class Class1
+    {
+    }
+}
diff --git a/Ressources/Dictionnaire.xaml b/Ressources/Dictionnaire.xaml
new file mode 100644
index 0000000..0c1ff6d
--- /dev/null
+++ b/Ressources/Dictionnaire.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <FontFamily x:Key="Police1">Candara Light</FontFamily>
+    <Brush x:Key="Couleur1">CadetBlue</Brush>
+    <Brush x:Key="Couleur2">PowderBlue</Brush>
+    <Brush x:Key="Couleur3">AliceBlue</Brush>
+    <Style TargetType="ComboBox">
+        <Setter Property="FontStyle" Value="Italic"/>
+        <Setter Property="Margin" Value="5"/>
+        <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
+        <Setter Property="Foreground" Value="{StaticResource Couleur1}"/>
+    </Style>
+    <Style TargetType="Button">
+        <Setter Property="BorderBrush" Value="{StaticResource Couleur3}"/>
+        <Setter Property="BorderThickness" Value="2"/>
+        <Setter Property="Background" Value="{StaticResource Couleur2}"/>
+        <Setter Property="Foreground" Value="{StaticResource Couleur3}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Ressources/Ressources.csproj b/Ressources/Ressources.csproj
new file mode 100644
index 0000000..2165726
--- /dev/null
+++ b/Ressources/Ressources.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>
diff --git a/WpfApp1.sln b/WpfApp1.sln
index 603969a..fc2ed36 100644
--- a/WpfApp1.sln
+++ b/WpfApp1.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp1", "WpfApp1\WpfApp1.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dossier1", "Dossier1", "{2FC31FB4-7243-43F2-86EF-BD66C3B0B0CD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ressources", "Ressources\Ressources.csproj", "{DA0ADA06-41C5-4DA6-8DE6-630CD98E254F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,6 +19,10 @@ Global
 		{514D830F-CCD6-4ADE-96F2-232C718D9BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{514D830F-CCD6-4ADE-96F2-232C718D9BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{514D830F-CCD6-4ADE-96F2-232C718D9BBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA0ADA06-41C5-4DA6-8DE6-630CD98E254F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA0ADA06-41C5-4DA6-8DE6-630CD98E254F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA0ADA06-41C5-4DA6-8DE6-630CD98E254F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA0ADA06-41C5-4DA6-8DE6-630CD98E254F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml
index d0fd560..1e7a803 100644
--- a/WpfApp1/AddAShark.xaml
+++ b/WpfApp1/AddAShark.xaml
@@ -8,11 +8,11 @@
         Title="AddAShark" Height="450" Width="800">
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
-            <TextBlock Text="ADD A SHARK" Background="AliceBlue" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Poppins" Foreground="PowderBlue"/>
-            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" BorderBrush="AliceBlue" BorderThickness="2" Background="PowderBlue" Width="50" Height="50" FontFamily="Poppins" FontSize="25" Foreground="AliceBlue"></Button>
+            <TextBlock Text="ADD A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="PowderBlue"/>
+            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" BorderBrush="AliceBlue" BorderThickness="2" Background="PowderBlue" Width="50" Height="50" FontFamily="Candara Light" FontSize="25" Foreground="AliceBlue"></Button>
         </DockPanel>
         <DockPanel Background="CadetBlue">
-            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="AliceBlue" FontFamily="Corbel Light"/>
+            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="AliceBlue" FontFamily="Candara Light"/>
             <Grid Width="800">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -33,7 +33,7 @@
                 <local:UserControlBoite Grid.Column="1" Grid.Row="1"/>
                 <local:UserControlBoite Grid.Column="1" Grid.Row="2"/>
                 <local:UserControlBoite Grid.Column="1" Grid.Row="3"/>
-                <Button Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100" Background="PowderBlue" BorderBrush="PowderBlue" Foreground="AliceBlue"/>
+                <Button Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100" Background="PowderBlue" BorderBrush="PowderBlue" FontFamily="Candara light" Foreground="AliceBlue"/>
             </Grid>
         </DockPanel>
     </DockPanel>
diff --git a/WpfApp1/App.xaml b/WpfApp1/App.xaml
index 2e70522..0c062d3 100644
--- a/WpfApp1/App.xaml
+++ b/WpfApp1/App.xaml
@@ -4,6 +4,10 @@
              xmlns:local="clr-namespace:WpfApp1"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Ressources;Component/Dictionnaire.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index dca647c..e0a0a72 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -7,23 +7,17 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
 
-    <Window.Resources>
-        <Style x:Key="buttonBasique" TargetType="Button">
-            <Setter Property="Background" Value="PowderBlue"></Setter>
-        </Style>
-    </Window.Resources>
-
     <DockPanel>
-        <DockPanel DockPanel.Dock="Left" Background="PowderBlue">
+        <DockPanel DockPanel.Dock="Left" >
 
-            <ComboBox Margin="5" FontStyle="Italic" DockPanel.Dock="Top" Foreground="CadetBlue">
+            <ComboBox DockPanel.Dock="Top" >
                 <ComboBoxItem Tag="Océans" IsSelected="True" >Tous</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Atlantique</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Indien</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Pacifique</ComboBoxItem>
             </ComboBox>
-            <ListBox Background="AliceBlue">
+            <ListBox Background="{StaticResource Couleur3}">
                 <local:UserControlRequin/>
                 <local:UserControlRequin/>
                 <local:UserControlRequin/>
@@ -38,7 +32,7 @@
         </DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="196,10,10,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
-            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="+" BorderBrush="AliceBlue" BorderThickness="2" Background="PowderBlue" Width="50" Height="50" FontFamily="Poppins" FontSize="25" Foreground="AliceBlue"></Button>
+            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="+" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
         <Image Source="Images\cartemaismieuxman.png"/>
     </DockPanel>
diff --git a/WpfApp1/UserControlBoite.xaml b/WpfApp1/UserControlBoite.xaml
index 4ed9118..debf689 100644
--- a/WpfApp1/UserControlBoite.xaml
+++ b/WpfApp1/UserControlBoite.xaml
@@ -12,7 +12,7 @@
             <RowDefinition/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <TextBlock Text="Nom" FontSize="12" Height="30" MaxWidth="400" Foreground="AliceBlue" TextAlignment="Center" Background="PowderBlue" Grid.Row="0"/>
+        <TextBlock Text="Nom" FontFamily="Candara Light" FontSize="12" Height="30" MaxWidth="400" Foreground="AliceBlue" TextAlignment="Center" Background="PowderBlue" Grid.Row="0"/>
         <TextBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="AliceBlue"/>
     </Grid>
 </UserControl>
diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj
index 5dd9341..d8163f2 100644
--- a/WpfApp1/WpfApp1.csproj
+++ b/WpfApp1/WpfApp1.csproj
@@ -10,4 +10,8 @@
     <Page Remove="View1.xaml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Ressources\Ressources.csproj" />
+  </ItemGroup>
+
 </Project>