From 51aef34c6248aaaad0c44f31f0d81f0f77892ea9 Mon Sep 17 00:00:00 2001
From: Sergey Nechaev <6499856+snechaev@users.noreply.github.com>
Date: Tue, 23 Sep 2025 20:56:50 +0200
Subject: [PATCH 1/2] Add InputGesture atttibute to MenuItems in order to
 display hotkeys in the UI. The HotKey attribute must still be set for hotkeys
 to be handled automatically.

---
 .../MainWindow.xaml                           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/StructuredLogViewer.Avalonia/MainWindow.xaml b/src/StructuredLogViewer.Avalonia/MainWindow.xaml
index 73c7c475c..a5bd9cd8a 100644
--- a/src/StructuredLogViewer.Avalonia/MainWindow.xaml
+++ b/src/StructuredLogViewer.Avalonia/MainWindow.xaml
@@ -15,20 +15,26 @@
                 <Separator />
                 <MenuItem Name="Build"
                           Header="_Build Solution/Project..."
-                          HotKey="F6" />
+                          HotKey="F6"
+                          InputGesture="F6"/>
                 <MenuItem Name="Rebuild"
                           Header="Rebuild Solution/Project"
-                          HotKey="Shift+F6" />
+                          HotKey="Shift+F6"
+                          InputGesture="Shift+F6"/>
                 <Separator />
                 <MenuItem Name="Open"
                           Header="_Open Log..."
-                          HotKey="Ctrl+O" />
+                          HotKey="Ctrl+O"
+                          InputGesture="Ctrl+O"/>
                 <MenuItem Name="ReloadMenu"
                           Header="_Reload"
-                          HotKey="F5" />
+                          HotKey="F5"
+                          InputGesture="F5"/>
                 <MenuItem Name="SaveAsMenu"
                           Header="_Save Log As..."
-                          HotKey="Ctrl+S" />
+                          HotKey="Ctrl+S"
+                          InputGesture="Ctrl+S"
+                          />
                 <Separator />
                 <MenuItem Name="RecentProjectsMenu"
                           Header="Recent Projects"
@@ -45,7 +51,8 @@
                 <Separator />
                 <MenuItem Name="Exit"
                           Header="E_xit"
-                          HotKey="Alt+F4" />
+                          HotKey="Alt+F4"
+                          InputGesture="Alt+F4"/>
             </MenuItem>
             <MenuItem Header="_Help">
                 <MenuItem Name="HelpLink"

From c2ab6b8db4c0cb1adb4355f51c02896030371aea Mon Sep 17 00:00:00 2001
From: Sergey Nechaev <6499856+snechaev@users.noreply.github.com>
Date: Tue, 23 Sep 2025 20:57:47 +0200
Subject: [PATCH 2/2] Do not handle the menuitems-assigned hotkeys manually.
 This fix should prevent the menu-attached actions from being called twice.
 Fixes #904.

---
 .../MainWindow.xaml.cs                        | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/StructuredLogViewer.Avalonia/MainWindow.xaml.cs b/src/StructuredLogViewer.Avalonia/MainWindow.xaml.cs
index 397f55777..aa9c55dbd 100644
--- a/src/StructuredLogViewer.Avalonia/MainWindow.xaml.cs
+++ b/src/StructuredLogViewer.Avalonia/MainWindow.xaml.cs
@@ -518,23 +518,7 @@ await System.Threading.Tasks.Task.Run(() =>
 
         private async void Window_KeyUp(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.F5)
-            {
-                Reload();
-            }
-            else if (e.Key == Key.F6 && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-            {
-                RebuildProjectOrSolution();
-            }
-            else if (e.Key == Key.F6)
-            {
-                await OpenProjectOrSolution();
-            }
-            else if (e.Key == Key.O && e.KeyModifiers.HasFlag(KeyModifiers.Control))
-            {
-                await OpenLogFile();
-            }
-            else if (e.Key == Key.F && e.KeyModifiers.HasFlag(KeyModifiers.Control))
+            if (e.Key == Key.F && e.KeyModifiers.HasFlag(KeyModifiers.Control))
             {
                 FocusSearch();
             }
@@ -546,10 +530,6 @@ private async void Window_KeyUp(object sender, KeyEventArgs e)
                     await Clipboard.SetTextAsync(content.MSBuildCommandLine);
                 }
             }
-            else if (e.Key == Key.S && e.KeyModifiers.HasFlag(KeyModifiers.Control))
-            {
-                _ = SaveAs();
-            }
         }
 
         private void FocusSearch()