diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll index cc7dd82..a18361a 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb index 6a63665..6eb5b11 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll index d033d9a..3cfc8f3 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb index 394c286..8ea2d39 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll index 4cd926f..b38d791 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb index 2071978..8f8a96e 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs index d700105..1025e64 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52e84eef603a5d794883bebebdb43f1496ad8c8b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache index 151bd86..402457f 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache @@ -1 +1 @@ -e7b322b31da6702bd8fe7d53b83645020505c1ad7318739a0b5cdd9dfc0dde15 +b26810a9701a80bd8d247c92ecf69824a86d42eff82b9218864ad2356c15c28a diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache index d36a822..8eb0979 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll index cc7dd82..a18361a 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb index 6a63665..6eb5b11 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll index d4f88ea..cd27c9c 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll index d4f88ea..cd27c9c 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll differ diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll index d033d9a..3cfc8f3 100644 Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb index 394c286..8ea2d39 100644 Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs index 05a16ae..99e88c4 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52e84eef603a5d794883bebebdb43f1496ad8c8b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache index ba9f41f..c66b3f4 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -1396b3ce6da72bd679b29887d28ac5d332cff2eb0de90d2707d5bce268e6c80d +1f8bedf408b8f59454ecc9fe6bdd5c389ea72f6f52e0c888b1f255e3586460ec diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll index d033d9a..3cfc8f3 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb index 394c286..8ea2d39 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll index a4b2764..69d7a74 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll differ diff --git a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll index a4b2764..69d7a74 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll index d033d9a..3cfc8f3 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb index 394c286..8ea2d39 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll index 4cd926f..b38d791 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb index 2071978..8f8a96e 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs index d68506d..9a90e7b 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52e84eef603a5d794883bebebdb43f1496ad8c8b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+11383fc75a9f1f764ac2f8fef2dd8f2da0c7e2b8")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache index de712c5..4206653 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache @@ -1 +1 @@ -e56b7dd48342043456665ffc9aa4f0072231f58ee5b6bcd43379b228c6c7a7c8 +4b1690178df789d1c5fd4816cf36ec319f0ceb403af602830b6577406a3b49da diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache index a999cd5..40e1a40 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll index 4cd926f..b38d791 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb index 2071978..8f8a96e 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll index 4fa0324..a66b60b 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll index 4fa0324..a66b60b 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll differ diff --git a/AquaCare.View/PflegeWindow.axaml b/AquaCare.View/PflegeWindow.axaml index ca93418..341e972 100644 --- a/AquaCare.View/PflegeWindow.axaml +++ b/AquaCare.View/PflegeWindow.axaml @@ -4,7 +4,8 @@ x:Class="AquaCare.View.PflegeWindow" xmlns:mc ="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="Pflege Werte eintragen" - Width="600" Height="500"> + Width="600" Height="500" + Icon="Ressourcen/Bilder/ProgrammIcon.ico"> diff --git a/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png b/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png new file mode 100644 index 0000000..0757455 Binary files /dev/null and b/AquaCare.View/Ressourcen/BilderTutorials/Beispiele/Pfeil.png differ diff --git a/AquaCare.View/Style.xaml b/AquaCare.View/Style.xaml index c15f11c..8997c38 100644 --- a/AquaCare.View/Style.xaml +++ b/AquaCare.View/Style.xaml @@ -4,12 +4,13 @@ diff --git a/AquaCare.View/TutorialsWindow.axaml b/AquaCare.View/TutorialsWindow.axaml index a307dd3..0899687 100644 --- a/AquaCare.View/TutorialsWindow.axaml +++ b/AquaCare.View/TutorialsWindow.axaml @@ -6,25 +6,16 @@ Icon="Ressourcen/Bilder/ProgrammIcon.ico"> - - - + - + - - - + Margin="0,10,0,10"/> @@ -60,7 +52,6 @@