Ressources et style améliorés

Ressources/Class1.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace Ressources
-{
-    public class Class1
-    {
-    }
-}

Ressources/Dictionnaire.xaml

@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <FontFamily x:Key="Police1">Candara Light</FontFamily>
+    <FontFamily x:Key="Police2">Candara</FontFamily>
     <Brush x:Key="Couleur1">CadetBlue</Brush>
     <Brush x:Key="Couleur2">PowderBlue</Brush>
     <Brush x:Key="Couleur3">AliceBlue</Brush>
@@ -11,12 +12,15 @@
         <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
         <Setter Property="Foreground" Value="{StaticResource Couleur1}"/>
     </Style>
-    <Style TargetType="Button">
+    <Style TargetType="Button" x:Key="Button1">
         <Setter Property="BorderBrush" Value="{StaticResource Couleur3}"/>
         <Setter Property="BorderThickness" Value="2"/>
         <Setter Property="Background" Value="{StaticResource Couleur2}"/>
         <Setter Property="Foreground" Value="{StaticResource Couleur3}"/>
-        <Setter Property=""
+        <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
+    </Style>
+    <Style TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
     </Style>
 
 </ResourceDictionary>

WpfApp1/AddAShark.xaml

@@ -9,10 +9,10 @@
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <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>
+            <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
-        <DockPanel Background="CadetBlue">
-            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="AliceBlue" FontFamily="Candara Light"/>
+        <DockPanel Background="{StaticResource Couleur1}">
+            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="{StaticResource Couleur3}" FontFamily="{StaticResource Police1}"/>
             <Grid Width="800">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>

WpfApp1/MainWindow.xaml

@@ -6,10 +6,9 @@
         xmlns:local="clr-namespace:WpfApp1"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
-
+    
     <DockPanel>
         <DockPanel DockPanel.Dock="Left" >
-
             <ComboBox DockPanel.Dock="Top" >
                 <ComboBoxItem Tag="Océans" IsSelected="True" >Tous</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
@@ -32,7 +31,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="+" Width="50" Height="50" FontSize="25"></Button>
+            <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="+" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
         <Image Source="Images\cartemaismieuxman.png"/>
     </DockPanel>

WpfApp1/UserControlRequin.xaml

@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <ListBoxItem>
-        <Border BorderThickness="2" BorderBrush="PowderBlue" CornerRadius="4" Padding="4">
+        <Border BorderThickness="2" BorderBrush="{StaticResource Couleur2}" CornerRadius="4" Padding="4">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -19,7 +19,7 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <Image Source="Images\Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg" Width="50" Height="30" Grid.RowSpan="3" Margin="4"/>
-                <TextBlock Grid.Column="1" Grid.Row="1" Text="Requin Dormeur Mexicain" FontWeight="DemiBold"/>
+                <TextBlock Grid.Column="1" Grid.Row="1" Text="Requin Dormeur Mexicain" FontFamily="{StaticResource Police2}"/>
                 <TextBlock Grid.Column="1" Grid.Row="2" Text="Heterodontus mexicanus" FontWeight="Thin"/>
             </Grid>
         </Border>