From 7c464937d3a5468573766e0f0a9afafdf9e3c63b Mon Sep 17 00:00:00 2001 From: majean5 Date: Wed, 13 Apr 2022 16:59:53 +0200 Subject: [PATCH] user control boite + page addashark --- Test/App.xaml | 9 +++++++++ Test/App.xaml.cs | 17 +++++++++++++++++ Test/AssemblyInfo.cs | 10 ++++++++++ Test/MainWindow.xaml | 12 ++++++++++++ Test/MainWindow.xaml.cs | 28 ++++++++++++++++++++++++++++ Test/Test.csproj | 9 +++++++++ Test/UCTest.xaml | 26 ++++++++++++++++++++++++++ Test/UCTest.xaml.cs | 28 ++++++++++++++++++++++++++++ WpfApp1/AddAShark.xaml | 28 ++++++++++++++++++++++++---- WpfApp1/UC.xaml | 28 ++++++++++++++++++++++++++++ WpfApp1/UC.xaml.cs | 28 ++++++++++++++++++++++++++++ WpfApp1/UserControlBoite.xaml | 6 +++--- 12 files changed, 222 insertions(+), 7 deletions(-) create mode 100644 Test/App.xaml create mode 100644 Test/App.xaml.cs create mode 100644 Test/AssemblyInfo.cs create mode 100644 Test/MainWindow.xaml create mode 100644 Test/MainWindow.xaml.cs create mode 100644 Test/Test.csproj create mode 100644 Test/UCTest.xaml create mode 100644 Test/UCTest.xaml.cs create mode 100644 WpfApp1/UC.xaml create mode 100644 WpfApp1/UC.xaml.cs diff --git a/Test/App.xaml b/Test/App.xaml new file mode 100644 index 0000000..d0fd442 --- /dev/null +++ b/Test/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/Test/App.xaml.cs b/Test/App.xaml.cs new file mode 100644 index 0000000..4d908a2 --- /dev/null +++ b/Test/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Test +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/Test/AssemblyInfo.cs b/Test/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ b/Test/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Test/MainWindow.xaml b/Test/MainWindow.xaml new file mode 100644 index 0000000..4777220 --- /dev/null +++ b/Test/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Test/MainWindow.xaml.cs b/Test/MainWindow.xaml.cs new file mode 100644 index 0000000..b16fa88 --- /dev/null +++ b/Test/MainWindow.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 Test +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/Test/Test.csproj b/Test/Test.csproj new file mode 100644 index 0000000..407932c --- /dev/null +++ b/Test/Test.csproj @@ -0,0 +1,9 @@ + + + + WinExe + net5.0-windows + true + + + diff --git a/Test/UCTest.xaml b/Test/UCTest.xaml new file mode 100644 index 0000000..7dbb0c0 --- /dev/null +++ b/Test/UCTest.xaml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Test/UCTest.xaml.cs b/Test/UCTest.xaml.cs new file mode 100644 index 0000000..75d2cb0 --- /dev/null +++ b/Test/UCTest.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 Test +{ + /// + /// Logique d'interaction pour UCTest.xaml + /// + public partial class UCTest : UserControl + { + public UCTest() + { + InitializeComponent(); + } + } +} diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml index 44b0523..d0fd560 100644 --- a/WpfApp1/AddAShark.xaml +++ b/WpfApp1/AddAShark.xaml @@ -11,10 +11,30 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + +