diff --git a/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml b/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml index 65caf28..cc936fc 100644 --- a/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml +++ b/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml @@ -7,6 +7,7 @@ + diff --git a/AvaloniaApplication14_Inventory_300326/Program.cs b/AvaloniaApplication14_Inventory_300326/Program.cs index 436c8da..1b7b1f6 100644 --- a/AvaloniaApplication14_Inventory_300326/Program.cs +++ b/AvaloniaApplication14_Inventory_300326/Program.cs @@ -29,7 +29,8 @@ sealed class Program service.AddTransient(); service.AddTransient(); service.AddTransient(); - + service.AddTransient(); + }).Build(); BuildAvaloniaApp(host.Services) diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs index a19bc73..2068425 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs @@ -1,6 +1,12 @@ +using AvaloniaApplication14_Inventory_300326.Views; + namespace AvaloniaApplication14_Inventory_300326.ViewModels; public class EquipmentEditingWindowViewModel : ViewModelBase { - + private EquipmentEditingWindow _currentWindow; + public void SetWindow(EquipmentEditingWindow window) + { + _currentWindow = window; + } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml index 2f6796f..b94cb0f 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml +++ b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml @@ -5,5 +5,41 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaApplication14_Inventory_300326.Views.EquipmentEditingWindow" Title="EquipmentEditingWindow"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs index 5b4cede..c6c82a1 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs +++ b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs @@ -1,13 +1,16 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using AvaloniaApplication14_Inventory_300326.ViewModels; namespace AvaloniaApplication14_Inventory_300326.Views; public partial class EquipmentEditingWindow : Window { - public EquipmentEditingWindow() + public EquipmentEditingWindow(EquipmentEditingWindowViewModel viewModel) { + DataContext = viewModel; InitializeComponent(); + viewModel.SetWindow(this); } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs index a0911fb..79dcd36 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cbf2b3c1d343b3e775109533b3de5382ddf0d55c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+780c9aad7c6af2565938cf22ec4549263f45beda")] [assembly: System.Reflection.AssemblyProductAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyTitleAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache index e03c4db..dc04523 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache @@ -1 +1 @@ -579358abf2419881fdf5be6d074ce09167d36f918fb2742d80f5fe41cf044223 +beec506b9d2b5f03e2d47924c1154535ad2de3f1cf50518116adabdbdcfd24be diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache index ac2a8d2..9752a85 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -bf4cf4167d1af19dcdd79f28d74d6e280f089043cf069c74a3cde874464ff374 +806493d39e5a14b7d6db72aa25a7c7887da7ba0828275029c2fe7758240bdf47 diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll index fca95c2..97d7e70 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb index c2bf690..817c3a0 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll index 452e5c9..d0a0264 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll index 452e5c9..d0a0264 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll differ