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

WpfApp1/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WpfApp1"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        Title="MainWindow" Height="550" Width="1000">
     
     <DockPanel>
         <DockPanel>

WpfApp1/MainWindow.xaml.cs

@@ -25,14 +25,12 @@ namespace WpfApp1
             InitializeComponent();
         }
 
-        private void ProgressBar_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+ 
-        {
-
-        }
-
         private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            
+            if (Tous.IsSelected)
+            {
+            }
         }
 
         public void ContentControlSwapDes()

WpfApp1/userControlAcceuil.xaml

@@ -17,7 +17,7 @@
             </Grid>
         </DockPanel>
         <DockPanel>
-            <Image Source="Images\cartemaismieuxman.png"/>
+            <Image Source="Images\cartemaismieuxman.png" x:Name="laCarte"/>
         </DockPanel>
     </DockPanel>
 

WpfApp1/userControlAcceuil.xaml.cs

@@ -24,5 +24,13 @@ namespace WpfApp1
         {
             InitializeComponent();
         }
+
+        public string Carte
+        {
+            set
+            {
+                laCarte.Source = new BitmapImage(new Uri(value, UriKind.Relative));
+            }
+        }
     }
 }