diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml index 6375c1a..398f0a1 100644 --- a/WpfApp1/MainWindow.xaml +++ b/WpfApp1/MainWindow.xaml @@ -9,12 +9,12 @@ - - Tous - Arctique - Atlantique - Indien - Pacifique + + Tous + Arctique + Atlantique + Indien + Pacifique diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs index 74d1adc..c1be124 100644 --- a/WpfApp1/MainWindow.xaml.cs +++ b/WpfApp1/MainWindow.xaml.cs @@ -32,7 +32,7 @@ namespace WpfApp1 private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) { - + } public void ContentControlSwapDes() diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml index 1bb1f88..b2c63b7 100644 --- a/WpfApp1/UserControlRequin.xaml +++ b/WpfApp1/UserControlRequin.xaml @@ -19,7 +19,7 @@ - + diff --git a/WpfApp1/Window1.xaml b/WpfApp1/Window1.xaml deleted file mode 100644 index 56d1e14..0000000 --- a/WpfApp1/Window1.xaml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Tous - Arctique - Atlantique - Indien - Pacifique - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WpfApp1/Window1.xaml.cs b/WpfApp1/Window1.xaml.cs deleted file mode 100644 index 874019f..0000000 --- a/WpfApp1/Window1.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; - -namespace WpfApp1 -{ - /// - /// Logique d'interaction pour Window1.xaml - /// - public partial class Window1 : Window - { - public Window1() - { - InitializeComponent(); - } - - } -} diff --git a/WpfApp1/Window2.xaml b/WpfApp1/Window2.xaml deleted file mode 100644 index 70e44cd..0000000 --- a/WpfApp1/Window2.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/WpfApp1/Window2.xaml.cs b/WpfApp1/Window2.xaml.cs deleted file mode 100644 index ee9307b..0000000 --- a/WpfApp1/Window2.xaml.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; - -namespace WpfApp1 -{ - /// - /// Logique d'interaction pour Window2.xaml - /// - public partial class Window2 : Window - { - public Window2() - { - InitializeComponent(); - } - } -} diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj index d8163f2..8a6acfd 100644 --- a/WpfApp1/WpfApp1.csproj +++ b/WpfApp1/WpfApp1.csproj @@ -6,12 +6,68 @@ true + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + PreserveNewest + + + + + + + + diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml index 4dca7b7..1c49ff5 100644 --- a/WpfApp1/userControlAcceuil.xaml +++ b/WpfApp1/userControlAcceuil.xaml @@ -10,14 +10,14 @@ - + - + diff --git a/WpfApp1/userControlDescription.xaml b/WpfApp1/userControlDescription.xaml index 98c7bff..11f3cd1 100644 --- a/WpfApp1/userControlDescription.xaml +++ b/WpfApp1/userControlDescription.xaml @@ -11,7 +11,7 @@