diff --git a/WpfApp1/Images/Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg b/WpfApp1/Images/Heterodontus_francisci_catalina.jpg
similarity index 100%
rename from WpfApp1/Images/Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg
rename to WpfApp1/Images/Heterodontus_francisci_catalina.jpg
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index b5dfcca..6375c1a 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -18,9 +18,6 @@
-
-
-
@@ -32,13 +29,12 @@
-
-
-
-
-
+
+
+
+
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index 86b7981..74d1adc 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -35,9 +35,13 @@ namespace WpfApp1
}
- private void UserControlRequin_MouseDown(object sender, MouseButtonEventArgs e)
+ public void ContentControlSwapDes()
{
- System.Diagnostics.Debug.WriteLine("Est ce que ça marche?\n");
+ contentControl.Content = new userControlDescription();
+ }
+ public void ContentControlSwapAcc()
+ {
+ contentControl.Content = new userControlAcceuil();
}
}
}
diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml
index fd87308..1bb1f88 100644
--- a/WpfApp1/UserControlRequin.xaml
+++ b/WpfApp1/UserControlRequin.xaml
@@ -6,10 +6,10 @@
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
- MouseDown="UserControl_MouseDown">
+ MouseDown="UserControlReq_MouseDown">
-
+
@@ -19,9 +19,9 @@
-
-
-
+
+
+
diff --git a/WpfApp1/UserControlRequin.xaml.cs b/WpfApp1/UserControlRequin.xaml.cs
index 4d30d38..c8e644a 100644
--- a/WpfApp1/UserControlRequin.xaml.cs
+++ b/WpfApp1/UserControlRequin.xaml.cs
@@ -12,7 +12,6 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-
namespace WpfApp1
{
///
@@ -26,9 +25,9 @@ namespace WpfApp1
}
- private void UserControl_MouseDown(object sender, MouseButtonEventArgs e)
+ public void UserControlReq_MouseDown(object sender, MouseButtonEventArgs e)
{
- System.Diagnostics.Debug.WriteLine("Est ce que ça marche?\n");
+ ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapDes();
}
}
}
diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml
new file mode 100644
index 0000000..6648918
--- /dev/null
+++ b/WpfApp1/userControlAcceuil.xaml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WpfApp1/userControlAcceuil.xaml.cs b/WpfApp1/userControlAcceuil.xaml.cs
new file mode 100644
index 0000000..9381d56
--- /dev/null
+++ b/WpfApp1/userControlAcceuil.xaml.cs
@@ -0,0 +1,28 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace WpfApp1
+{
+ ///
+ /// Logique d'interaction pour userControlAcceuil.xaml
+ ///
+ public partial class userControlAcceuil : UserControl
+ {
+ public userControlAcceuil()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WpfApp1/userControlDescription.xaml b/WpfApp1/userControlDescription.xaml
new file mode 100644
index 0000000..51d5757
--- /dev/null
+++ b/WpfApp1/userControlDescription.xaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WpfApp1/userControlDescription.xaml.cs b/WpfApp1/userControlDescription.xaml.cs
new file mode 100644
index 0000000..29e1b64
--- /dev/null
+++ b/WpfApp1/userControlDescription.xaml.cs
@@ -0,0 +1,33 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace WpfApp1
+{
+ ///
+ /// Logique d'interaction pour userControlDescription.xaml
+ ///
+ public partial class userControlDescription : UserControl
+ {
+ public userControlDescription()
+ {
+ InitializeComponent();
+ }
+
+ private void exit_Click(object sender, RoutedEventArgs e)
+ {
+ ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
+ }
+ }
+}