diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs index 909eaa5..c5c5196 100644 --- a/WpfApp1/App.xaml.cs +++ b/WpfApp1/App.xaml.cs @@ -13,5 +13,9 @@ namespace WpfApp1 /// public partial class App : Application { + public void Temp() + { + var mw = MainWindow; + } } } diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs index ce242e5..09ee5a0 100644 --- a/WpfApp1/MainWindow.xaml.cs +++ b/WpfApp1/MainWindow.xaml.cs @@ -19,11 +19,17 @@ namespace WpfApp1 /// /// Interaction logic for MainWindow.xaml /// + /// + + public Manager Mgr => (Application.Current as App).LeManager; public partial class MainWindow : Window { public MainWindow() { InitializeComponent(); + + Mgr.LoadRequins(); + List zones = new List { Zone.ATLANTIQUE, Zone.ARCTIQUE }; uc1.requin = new Requin("Bob le bricoleur", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!"); uc2.requin = new Requin("Requin Dormeur Mexdzdqzdicain", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!"); diff --git a/WpfApp1/userControlDescription.xaml.cs b/WpfApp1/userControlDescription.xaml.cs index f56d115..c013430 100644 --- a/WpfApp1/userControlDescription.xaml.cs +++ b/WpfApp1/userControlDescription.xaml.cs @@ -60,7 +60,7 @@ namespace WpfApp1 sciName.Text = requin.NomSci; desc.Text = requin.Description; photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative)); - vid.Source=bite; + cartePic.Source = new BitmapImage(new Uri(Requin.PhotoCarte, UriKind.Relative)); }