diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml index 2ce6fb7..1080176 100644 --- a/WpfApp1/MainWindow.xaml +++ b/WpfApp1/MainWindow.xaml @@ -32,7 +32,7 @@ - + diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs index f064037..83fc6ee 100644 --- a/WpfApp1/MainWindow.xaml.cs +++ b/WpfApp1/MainWindow.xaml.cs @@ -37,9 +37,18 @@ namespace WpfApp1 { contentControl.Content = new userControlDescription(); } + + + public void ContentControlSwapAcc() { - contentControl.Content = new userControlAcceuil(); + contentControl.Content = new userControlEdit(); + } + + + public void ContentControlSwapEdit() + { + contentControl.Content = new userControlEdit(); } private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e) diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml index 057f838..19aee52 100644 --- a/WpfApp1/UserControlRequin.xaml +++ b/WpfApp1/UserControlRequin.xaml @@ -21,7 +21,7 @@ - + diff --git a/WpfApp1/UserControlRequin.xaml.cs b/WpfApp1/UserControlRequin.xaml.cs index 59e8a39..4634a44 100644 --- a/WpfApp1/UserControlRequin.xaml.cs +++ b/WpfApp1/UserControlRequin.xaml.cs @@ -22,12 +22,10 @@ namespace WpfApp1 /// public partial class UserControlRequin : UserControl { - public UserControlRequin() + public UserControlRequin(Requin requin) { InitializeComponent(); - name.Text = requin.Nom; - sciName.Text = requin.NomSci; - image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative)); + uptadeUi(requin); } @@ -37,7 +35,15 @@ namespace WpfApp1 ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapDes(); } - public Requin requin { get; private set; } + public Requin requin { get; set; } + + + public void uptadeUi(Requin requin) + { + nameReq.Text = requin.Nom; + sciName.Text = requin.NomSci; + image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative)); + } } diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml index e69083f..35f7952 100644 --- a/WpfApp1/userControlAcceuil.xaml +++ b/WpfApp1/userControlAcceuil.xaml @@ -1,4 +1,4 @@ - /// Logique d'interaction pour userControlAcceuil.xaml /// - public partial class userControlAcceuil : UserControl + public partial class userControlEdit : UserControl { - public userControlAcceuil() + public userControlEdit() { InitializeComponent(); } diff --git a/WpfApp1/userControlDescription.xaml b/WpfApp1/userControlDescription.xaml index 314a0f9..bb67711 100644 --- a/WpfApp1/userControlDescription.xaml +++ b/WpfApp1/userControlDescription.xaml @@ -28,11 +28,11 @@ - - - + + + - - + - - - - + + + + diff --git a/WpfApp1/userControlDescription.xaml.cs b/WpfApp1/userControlDescription.xaml.cs index 03d0b72..ff288b4 100644 --- a/WpfApp1/userControlDescription.xaml.cs +++ b/WpfApp1/userControlDescription.xaml.cs @@ -32,7 +32,7 @@ namespace WpfApp1 private void edit_Click(object sender, RoutedEventArgs e) { - + ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit(); } } }