avalonia update

one-ware · Sep 25, 2023 · 0cfcd75 · 0cfcd75
1 parent bb7cb93
commit 0cfcd75
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/build/props/Avalonia.Browser.props b/build/props/Avalonia.Browser.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Browser" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Controls.ColorPicker.props b/build/props/Avalonia.Controls.ColorPicker.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Controls.DataGrid.props b/build/props/Avalonia.Controls.DataGrid.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Desktop.props b/build/props/Avalonia.Desktop.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Diagnostics.props b/build/props/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.2" Condition="'$(Configuration)' == 'Debug'" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" Condition="'$(Configuration)' == 'Debug'" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Fonts.Inter.props b/build/props/Avalonia.Fonts.Inter.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.Themes.Simple.props b/build/props/Avalonia.Themes.Simple.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/build/props/Avalonia.props b/build/props/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.2" />
+        <PackageReference Include="Avalonia" Version="11.0.4" />
     </ItemGroup>
 </Project>
diff --git a/src/OneWare.Core/App.axaml.cs b/src/OneWare.Core/App.axaml.cs
@@ -172,6 +172,19 @@ protected override AvaloniaObject CreateShell()
                     DataContext = Container.Resolve<AboutViewModel>()
                 }))
             });
+            windowService.RegisterMenuItem("MainWindow_MainMenu", new MenuItemModel("Extras")
+            {
+                Header = "Extras",
+                Priority = 900
+            });
+            windowService.RegisterMenuItem("MainWindow_MainMenu/Extras", new MenuItemModel("Settings")
+            {
+                Header = $"Settings",
+                Command = new RelayCommand(() => windowService.Show(new ApplicationSettingsView()
+                {
+                    DataContext = ContainerLocator.Container.Resolve<ApplicationSettingsViewModel>()
+                }))
+            });
             windowService.RegisterMenuItem("MainWindow_MainMenu/Code", new MenuItemModel("Format")
             {
                 Header = $"Format",

diff --git a/src/OneWare.PackageManager/PackageManagerModule.cs b/src/OneWare.PackageManager/PackageManagerModule.cs
@@ -21,11 +21,6 @@ public void OnInitialized(IContainerProvider containerProvider)
     {
         var windowService = containerProvider.Resolve<IWindowService>();
 
-        windowService.RegisterMenuItem("MainWindow_MainMenu", new MenuItemModel("Extras")
-        {
-            Header = "Extras",
-            Priority = 900
-        });
         windowService.RegisterMenuItem("MainWindow_MainMenu/Extras", new MenuItemModel("Extensions")
         {
             Header = "Extensions",

diff --git a/src/OneWare.PackageManager/ViewModels/PackageManagerViewModel.cs b/src/OneWare.PackageManager/ViewModels/PackageManagerViewModel.cs
@@ -101,7 +101,6 @@ public async Task LoadPackagesAsync()
         RegisterPackageCategory(new PackageCategoryModel("Misc", Application.Current?.GetResourceObservable("Module")));
 
         SelectedCategory = PackageCategories.First();
-
 
         await LoadPackageRepositoryAsync(
             "https://raw.githubusercontent.com/ProtopSolutions/OneWare.PublicPackages/main/oneware-packages.json", _cancellationTokenSource.Token);