From ffdcd89745443e4764ed330a0808fd5b8cbda381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Thu, 19 Oct 2023 01:52:39 +0100
Subject: [PATCH] v4.0.3

- (Change) macOS: Change from Control to Command key to activate shortcuts from main menu (#766)
- (Upgrade) .NET from 6.0.22 to 6.0.23
- (Upgrade) AvaloniaUI from 11.0.4 to 11.0.5
---
 .github/workflows/package-publish.yml         |  9 +--
 CHANGELOG.md                                  |  6 ++
 RELEASE_NOTES.md                              |  5 +-
 .../UVtools.AvaloniaControls.csproj           |  2 +-
 UVtools.Core/UVtools.Core.csproj              |  2 +-
 UVtools.UI/Controls/KernelControl.axaml.cs    |  1 -
 UVtools.UI/MainWindow.axaml                   | 57 +++++++++----------
 UVtools.UI/UVtools.UI.csproj                  | 22 +++----
 8 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml
index 1567cbf2..ed2ef2da 100644
--- a/.github/workflows/package-publish.yml
+++ b/.github/workflows/package-publish.yml
@@ -22,6 +22,7 @@ jobs:
           identifier: ${{ env.WINGET_PACKAGE_ID }}
           token: ${{ env.WINGET_TOKEN }}
 
+  # Manual way
   #winget:
   #  name: Winget - Pull request
   #  runs-on: windows-latest
@@ -54,15 +55,14 @@ jobs:
   #    - name: Submit package to Windows Package Manager Community Repository
   #      run: .\wingetcreate.exe update ${env:WINGET_PACKAGE_ID} --version ${env:VERSION} --urls ${env:INSTALLER_URL} --token ${env:WINGET_TOKEN} --submit
 
-  # NOT WORKING
+  
   #homebrew:
-  #  name: Homebrew Cask - Pull request
+  #  name: 🚀 Homebrew Cask - Pull request
   #  runs-on: macos-latest
   #  steps:
-  #    - run: export HOMEBREW_GITHUB_API_TOKEN=${HOMEBREW_GITHUB_API_TOKEN}
   #    - uses: macauley/action-homebrew-bump-cask@v1
   #      with:
-  #        token: ${WINGET_TOKEN}
+  #        token: ${{ env.WINGET_TOKEN }}
   #        cask: uvtools
 
   nuget:
@@ -72,6 +72,7 @@ jobs:
     steps:
       - name: 🛒 Checkout
         uses: actions/checkout@v3
+
       - name: Verify commit exists in origin/master
         run: |
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cffc0030..2a643552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## /10/2023 - v4.0.3
+
+- (Change) macOS: Change from Control to Command key to activate shortcuts from main menu (#766)
+- (Upgrade) .NET from 6.0.22 to 6.0.23
+- (Upgrade) AvaloniaUI from 11.0.4 to 11.0.5
+
 ## 02/10/2023 - v4.0.2
 
 - (Change) UI: Layer height inputs minimum from 0.01mm to 0.001mm (#761)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 89d55f5f..037f86ed 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,4 @@
-- (Change) UI: Layer height inputs minimum from 0.01mm to 0.001mm (#761)
-- (Fix) Goo: The value of "RetractHeight" was not being set to the file (#763)
+- (Change) macOS: Change from Control to Command key to activate shortcuts from main menu (#766)
+- (Upgrade) .NET from 6.0.22 to 6.0.23
+- (Upgrade) AvaloniaUI from 11.0.4 to 11.0.5
 
diff --git a/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj b/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
index 4e85e8ac..ece6905e 100644
--- a/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
+++ b/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
@@ -24,7 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.0.4" />
+		<PackageReference Include="Avalonia" Version="11.0.5" />
 	</ItemGroup>
 
 </Project>
diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj
index f55c82d6..b9622172 100644
--- a/UVtools.Core/UVtools.Core.csproj
+++ b/UVtools.Core/UVtools.Core.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<Platforms>AnyCPU;x64</Platforms>
-		<Version>4.0.2</Version>
+		<Version>4.0.3</Version>
 
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DocumentationFile>..\documentation\$(AssemblyName).xml</DocumentationFile>
diff --git a/UVtools.UI/Controls/KernelControl.axaml.cs b/UVtools.UI/Controls/KernelControl.axaml.cs
index b4852fea..261ca82d 100644
--- a/UVtools.UI/Controls/KernelControl.axaml.cs
+++ b/UVtools.UI/Controls/KernelControl.axaml.cs
@@ -20,7 +20,6 @@ public KernelConfiguration? Kernel
         set => SetAndRaise(KernelProperty, ref _kernel, value);
     }
 
-        
 
     public KernelControl()
     {
diff --git a/UVtools.UI/MainWindow.axaml b/UVtools.UI/MainWindow.axaml
index f601091d..ace32787 100644
--- a/UVtools.UI/MainWindow.axaml
+++ b/UVtools.UI/MainWindow.axaml
@@ -16,23 +16,22 @@
         DragDrop.AllowDrop="True">
 
 	<uc:WindowEx.KeyBindings>
-		<KeyBinding Gesture="Ctrl+O" Command="{Binding MenuFileOpenClicked}"/>
-		<KeyBinding Gesture="Ctrl+Shift+O" Command="{Binding MenuFileOpenNewWindowClicked}"/>
-		<KeyBinding Gesture="Ctrl+F5" Command="{Binding ReloadFile}"/>
-		<KeyBinding Gesture="Ctrl+F2" Command="{Binding MenuFileRenameClicked}"/>
-		<KeyBinding Gesture="Ctrl+S" Command="{Binding MenuFileSaveClicked}"/>
-		<KeyBinding Gesture="Ctrl+Shift+S" Command="{Binding MenuFileSaveAsClicked}"/>
-		<KeyBinding Gesture="Ctrl+W" Command="{Binding OnMenuFileCloseFile}"/>
-		<KeyBinding Gesture="Ctrl+P" Command="{Binding IPrintedThisFile}"/>
-		<KeyBinding Gesture="Ctrl+P" Command="{Binding IPrintedThisFile}"/>
-		<KeyBinding Gesture="Ctrl+Shift+L" Command="{Binding MenuFileOpenContainingFolderClicked}"/>
-		<KeyBinding Gesture="Ctrl+E" Command="{Binding ExtractFile}"/>
-		<KeyBinding Gesture="Ctrl+Shift+T" Command="{Binding OpenTerminal}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+O, macOS=⌘+O}" Command="{Binding MenuFileOpenClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+Shift+O, macOS=⌘+Shift+O}" Command="{Binding MenuFileOpenNewWindowClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+F5, macOS=⌘+F5}" Command="{Binding ReloadFile}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+F2, macOS=⌘+F2}" Command="{Binding MenuFileRenameClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+S, macOS=⌘+S}" Command="{Binding MenuFileSaveClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+Shift+S, macOS=⌘+Shift+S}" Command="{Binding MenuFileSaveAsClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+W, macOS=⌘+W}" Command="{Binding OnMenuFileCloseFile}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+P, macOS=⌘+P}" Command="{Binding IPrintedThisFile}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+Shift+L, macOS=⌘+Shift+L}" Command="{Binding MenuFileOpenContainingFolderClicked}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+E, macOS=⌘+E}" Command="{Binding ExtractFile}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+Shift+T, macOS=⌘+Shift+T}" Command="{Binding OpenTerminal}"/>
 		<KeyBinding Gesture="F11" Command="{Binding OnMenuFileFullscreen}"/>
 		<KeyBinding Gesture="F12" Command="{Binding MenuFileSettingsClicked}"/>
 
 		<KeyBinding Gesture="F1" Command="{Binding MenuHelpAboutClicked}"/>
-		<KeyBinding Gesture="Ctrl+F1" Command="{Binding OpenHomePage}"/>
+		<KeyBinding Gesture="{OnPlatform Ctrl+F1, macOS=⌘+F1}" Command="{Binding OpenHomePage}"/>
 		<KeyBinding Gesture="F10" Command="{Binding MenuHelpMaterialManagerClicked}"/>
 		<KeyBinding Gesture="F10" Command="{Binding MenuHelpMaterialManagerClicked}"/>
     </uc:WindowEx.KeyBindings>
@@ -43,13 +42,13 @@
 				<MenuItem Name="MainMenuFile" Header="_File">
 					<MenuItem Name="MainMenuFileOpen"
 							  Header="_Open"
-							  HotKey="Ctrl+O" InputGesture="Ctrl+O"
+							  HotKey="{OnPlatform Ctrl+O, macOS=⌘+O}" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding MenuFileOpenClicked}"
 							  i:MenuItem.Icon="fa-solid fa-file-import"/>
 
 					<MenuItem Name="MainMenuFileOpenNewWindow"
 							  Header="Open in _new window"
-							  HotKey="Ctrl+Shift+O" InputGesture="Ctrl+Shift+O"
+							  HotKey="{OnPlatform Ctrl+Shift+O, macOS=⌘+Shift+O}" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding MenuFileOpenNewWindowClicked}"
 							  i:MenuItem.Icon="fa-solid fa-file-import"/>
 
@@ -72,28 +71,28 @@
 
 					<MenuItem Name="MainMenuFileReload"
 							  Header="_Reload"
-                              HotKey="Ctrl+F5" InputGesture="Ctrl+F5"
+                              HotKey="{OnPlatform Ctrl+F5, macOS=⌘+F5}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding IsFileLoaded}"
 							  Command="{Binding ReloadFile}"
 							  i:MenuItem.Icon="mdi-file-restore"/>
 
                     <MenuItem Name="MainMenuFileRename"
                               Header="_Rename"
-                              HotKey="Ctrl+F2" InputGesture="Ctrl+F2"
+                              HotKey="{OnPlatform Ctrl+F2, macOS=⌘+F2}" InputGesture="{Binding $self.HotKey}"
                               IsEnabled="{Binding IsFileLoaded}"
                               Command="{Binding MenuFileRenameClicked}"
                               i:MenuItem.Icon="fa-solid fa-pen-to-square"/>
 
 					<MenuItem Name="MainMenuFileSave"
 							  Header="_Save"
-							  HotKey="Ctrl+S" InputGesture="Ctrl+S"
+							  HotKey="{OnPlatform Ctrl+S, macOS=⌘+S}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding CanSave}"
 							  Command="{Binding MenuFileSaveClicked}"
 							  i:MenuItem.Icon="fa-solid fa-floppy-disk"/>
 
 					<MenuItem Name="MainMenuFileSaveAs"
 							  Header="Save _as"
-							  HotKey="Ctrl+Shift+S" InputGesture="Ctrl+Shift+S"
+							  HotKey="{OnPlatform Ctrl+Shift+S, macOS=⌘+Shift+S}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding IsFileLoaded}"
 							  Command="{Binding MenuFileSaveAsClicked}"
 							  i:MenuItem.Icon="fa-solid fa-floppy-disk"/>
@@ -106,7 +105,7 @@
 
 					<MenuItem Name="MainMenuFileClose"
 							  Header="_Close"
-							  HotKey="Ctrl+W" InputGesture="Ctrl+W"
+							  HotKey="{OnPlatform Ctrl+W, macOS=⌘+W}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding IsFileLoaded}"
 							  Command="{Binding OnMenuFileCloseFile}"
 							  i:MenuItem.Icon="fa-solid fa-sign-out-alt"/>
@@ -125,27 +124,27 @@
                     </MenuItem>
 
                         <MenuItem Header="I _printed this file" 
-                                  HotKey="Ctrl+P" InputGesture="Ctrl+P"
+                                  HotKey="{OnPlatform Ctrl+P, macOS=⌘+P}" InputGesture="{Binding $self.HotKey}"
                                   IsEnabled="{Binding IsFileLoaded}"
                                   Command="{Binding IPrintedThisFile}"
                                   i:MenuItem.Icon="fa-solid fa-flask"/>
 
 					<MenuItem Name="MainMenuFileOpenContainingFileFolder"
 							  Header="Open containing fo_lder"
-							  HotKey="Ctrl+Shift+L" InputGesture="Ctrl+Shift+L"
+							  HotKey="{OnPlatform Ctrl+Shift+L, macOS=⌘+Shift+L}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding IsFileLoaded}"
 							  Command="{Binding MenuFileOpenContainingFolderClicked}"
 							  i:MenuItem.Icon="fa-solid fa-folder-open"/>
 
 					<MenuItem Name="MainMenuFileExtract"
 							  Header="_Extract file contents" 
-                              HotKey="Ctrl+E" InputGesture="Ctrl+E"
+                              HotKey="{OnPlatform Ctrl+E, macOS=⌘+E}" InputGesture="{Binding $self.HotKey}"
 							  IsEnabled="{Binding IsFileLoaded}"
 							  Command="{Binding ExtractFile}"
 							  i:MenuItem.Icon="fa-solid fa-box-open"/>
 
 					<MenuItem Name="MainMenuFileTerminal"
-							  HotKey="Ctrl+Shift+T" InputGesture="Ctrl+Shift+T"
+							  HotKey="{OnPlatform Ctrl+Shift+T, macOS=⌘+Shift+T}" InputGesture="{Binding $self.HotKey}"
 							  Header="_Terminal"
 							  Command="{Binding OpenTerminal}"
 							  IsEnabled="{Binding IsFileLoaded}"
@@ -171,13 +170,13 @@
 
                     <MenuItem Name="MainMenuFileFullscreen"
                               Header="_Fullscreen"
-                              InputGesture="F11" HotKey="F11"
+                              HotKey="F11" InputGesture="{Binding $self.HotKey}"
                               Command="{Binding OnMenuFileFullscreen}"
                               i:MenuItem.Icon="fa-solid fa-window-maximize"/>
 
 					<MenuItem Name="MainMenuFileSettings"
 							  Header="_Settings"
-							  InputGesture="F12" HotKey="F12"
+							  HotKey="F12" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding MenuFileSettingsClicked}"
 							  i:MenuItem.Icon="fa-solid fa-cog"/>
 
@@ -205,12 +204,12 @@
 
 				<MenuItem Header="_Help">
 					<MenuItem Header="_About"
-                              HotKey="F1" InputGesture="F1"
+                              HotKey="F1" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding MenuHelpAboutClicked}"
 							  i:MenuItem.Icon="fa-solid fa-info-circle"/>
 
 					<MenuItem Header="_Website"
-							  HotKey="Ctrl+F1" InputGesture="Ctrl+F1"
+							  HotKey="{OnPlatform Ctrl+F1, macOS=⌘+F1}" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding OpenHomePage}"
 							  i:MenuItem.Icon="fa-brands fa-edge"/>
 
@@ -236,7 +235,7 @@
 					<Separator/>
 
 					<MenuItem Header="_Material manager"
-							  HotKey="F10" InputGesture="F10"
+							  HotKey="F10" InputGesture="{Binding $self.HotKey}"
 							  Command="{Binding MenuHelpMaterialManagerClicked}"
 							  i:MenuItem.Icon="fa-solid fa-flask"/>
 
diff --git a/UVtools.UI/UVtools.UI.csproj b/UVtools.UI/UVtools.UI.csproj
index ef7c5d76..06c3e72d 100644
--- a/UVtools.UI/UVtools.UI.csproj
+++ b/UVtools.UI/UVtools.UI.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<AssemblyName>UVtools</AssemblyName>
-		<Version>4.0.2</Version>
+		<Version>4.0.3</Version>
 		<Platforms>AnyCPU;x64</Platforms>
 
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -15,17 +15,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
+		<PackageReference Include="Avalonia" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" />
 		<PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
-		<PackageReference Include="Projektanker.Icons.Avalonia" Version="8.2.0" />
-		<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="8.2.0" />
-		<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="8.2.0" />
+		<PackageReference Include="Projektanker.Icons.Avalonia" Version="8.3.0" />
+		<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="8.3.0" />
+		<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="8.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>