diff --git a/StubLib/Stub.cs b/StubLib/Stub.cs index 1d7759a..47eba36 100644 --- a/StubLib/Stub.cs +++ b/StubLib/Stub.cs @@ -14,7 +14,7 @@ namespace StubLib { List zone = new List { Zone.ATLANTIQUE }; List zone2 = new List { Zone.PACIFIQUE }; - requins.Add(new Requin("mon requin adoré", "trop cool ce requin", "wow il est trop bo", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EW, zone, "(C'est pas un vrai requin)")); + requins.Add(new Requin("mon requin adoré", "trop cool ce requin", "wow il est trop bo", "Images/Dormeur-Mexicain.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EW, zone, "(C'est pas un vrai requin)")); requins.Add(new Requin("Banane", "Le requin banal", "C'est un requin ultra banal", "Images/White_shark.png", "Videos/Vid-Requin-Blanc.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.LC, zone, "Il est pas aussi banal qu'il en a l'air")); requins.Add(new Requin("Req1", "Le requin pas banal", "C'est un requin pas ultra banal", "Images/White_shark.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EX, zone2, "Il est vraiment pas banal")); } diff --git a/WpfApp1/Images/Dormeur-Mexicain.jpg b/WpfApp1/Images/Dormeur-Mexicain.png similarity index 100% rename from WpfApp1/Images/Dormeur-Mexicain.jpg rename to WpfApp1/Images/Dormeur-Mexicain.png diff --git a/WpfApp1/Images/shrekMap.png b/WpfApp1/Images/shrekMap.png new file mode 100644 index 0000000..8e45c5b Binary files /dev/null and b/WpfApp1/Images/shrekMap.png differ diff --git a/WpfApp1/Images/shrekin.png b/WpfApp1/Images/shrekin.png new file mode 100644 index 0000000..f65a693 Binary files /dev/null and b/WpfApp1/Images/shrekin.png differ diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml index b546e30..fc0ee4f 100644 --- a/WpfApp1/MainWindow.xaml +++ b/WpfApp1/MainWindow.xaml @@ -17,7 +17,7 @@ Indien Pacifique - + diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs index 2d73ef5..2c3e950 100644 --- a/WpfApp1/MainWindow.xaml.cs +++ b/WpfApp1/MainWindow.xaml.cs @@ -29,7 +29,7 @@ namespace WpfApp1 { public Manager Mgr => (Application.Current as App).LeManager; - public List lReq = new List(); + Nullable zonePage{ get; set; } public MainWindow() { @@ -47,7 +47,6 @@ namespace WpfApp1 } - // Requin requin { get; set; } @@ -61,26 +60,31 @@ namespace WpfApp1 { if (Region.SelectedIndex == 0) { + zonePage = null; chargerUC(); } else if (Region.SelectedIndex == 1) { + zonePage = Zone.ARCTIQUE; viderListBox(); changerListBox(Zone.ARCTIQUE); } else if (Region.SelectedIndex == 2) { + zonePage = Zone.ATLANTIQUE; viderListBox(); changerListBox(Zone.ATLANTIQUE); } else if (Region.SelectedIndex == 3) { + zonePage = Zone.INDIEN; viderListBox(); changerListBox(Zone.INDIEN); } else if (Region.SelectedIndex == 4) { + zonePage = Zone.PACIFIQUE; viderListBox(); changerListBox(Zone.PACIFIQUE); } @@ -116,11 +120,9 @@ namespace WpfApp1 public void chargerUC() { - lReq.Clear(); viderListBox(); foreach(Requin req in Mgr.Requins) { - lReq.Add(req); laListe.Items.Add(new UserControlRequin { requin = req }); } } @@ -128,7 +130,7 @@ namespace WpfApp1 public void changerListBox(Zone zone) { int test = 0; - int i = 0; + viderListBox(); foreach (Requin req in Mgr.Requins) { foreach (Zone z in req.Repartition) @@ -140,11 +142,7 @@ namespace WpfApp1 } if (test > 0) { - - } - else - { - i++; + laListe.Items.Add((new UserControlRequin { requin = req })); } test = 0; } @@ -162,35 +160,48 @@ namespace WpfApp1 } - private void Rechercher_KeyDown(object sender, KeyEventArgs e) + private void Rechercher_KeyUp(object sender, KeyEventArgs e) { - + viderListBox(); List nvReq = new List(); - foreach (Requin requin in lReq) - { - nvReq.Add(requin); - } - int i = 0; string rech = Rechercher.Text; + int test = 0; if (!string.IsNullOrWhiteSpace(rech)) { - foreach (Requin req in nvReq) + foreach (Requin req in Mgr.Requins) { - if (!req.Nom.Contains(rech) && !req.NomSci.Contains(rech)) + if (zonePage == null) { - lReq.Remove(req); - laListe.Items.RemoveAt(i); + if (req.Nom.Contains(rech) || req.NomSci.Contains(rech)) + { + laListe.Items.Add((new UserControlRequin { requin = req })); + } } else { - i++; + foreach (Zone z in req.Repartition) + { + if ((req.Nom.Contains(rech) || req.NomSci.Contains(rech)) && zonePage==z) + { + test++; + } + } + if (test > 0) + { + laListe.Items.Add((new UserControlRequin { requin = req })); + } } + test = 0; } } else { ChangeRegion(); } + if (rech == "Shrek" || rech=="shrek") + { + laListe.Items.Add((new UserControlRequin { requin = new Requin("Shrek", "Ogre", "I see you are a person of culture as well.\n\nFais ton grrrrr", "Images/shrekin.png", "Videos/shrekin.mp4", "Images/shrekMap.png", Conservation.EW, null, "GET OUT OF MY SEA") })); + } } } } diff --git a/WpfApp1/Videos/shrekin.mp4 b/WpfApp1/Videos/shrekin.mp4 new file mode 100644 index 0000000..b33e867 Binary files /dev/null and b/WpfApp1/Videos/shrekin.mp4 differ diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj index 8944cbc..b09de9f 100644 --- a/WpfApp1/WpfApp1.csproj +++ b/WpfApp1/WpfApp1.csproj @@ -13,7 +13,7 @@ - + @@ -25,10 +25,13 @@ + + + @@ -65,6 +68,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -77,6 +86,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -94,7 +106,7 @@ - + PreserveNewest