Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/thchazot1/cshark

WpfApp1/WpfApp1.csproj

@@ -28,6 +28,7 @@
     <None Remove="Images\User.png" />
     <None Remove="Images\VU.png" />
     <None Remove="Images\White_shark.png" />
+    <None Remove="Videos\requin_Asley.mp4" />
     <None Remove="Videos\Vid-dormeur-mexicain.mp4" />
     <None Remove="Videos\Vid-Requin-Blanc.mp4" />
   </ItemGroup>
@@ -73,6 +74,9 @@
     <Content Include="Images\White_shark.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Videos\requin_Asley.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Videos\Vid-dormeur-mexicain.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

WpfApp1/userControlDescription.xaml

@@ -34,7 +34,7 @@
                 <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
                     <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center"  x:Name="desc" Text="{Binding SelectedRequin.Description}"></TextBlock>
                 </ScrollViewer>
-                <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vid" />
+                <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vid" MouseDown="vid_MouseDown"/>
           </Grid>
         </DockPanel>
         <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">

WpfApp1/userControlDescription.xaml.cs

@@ -37,6 +37,8 @@ namespace WpfApp1
             }
         }
 
+        public int cmp = 0;
+
         private void exit_Click(object sender, RoutedEventArgs e)
         {
             ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
@@ -60,5 +62,14 @@ namespace WpfApp1
             consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
             cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.Relative));
         }
+
+        private void vid_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            cmp = cmp+1;
+            if (cmp == 10)
+            {
+                vid.Source = new Uri("Videos/requin_Asley.mp4", UriKind.Relative);
+            }
+        }
     }
 }