From 68566b9b34d924a31a80294626e2eabb57971509 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 18:19:59 +0800
Subject: [PATCH] =?UTF-8?q?enhance:=20use=20`=E2=8C=98`=20instead=20of=20`?=
 =?UTF-8?q?Ctrl`=20,=20`=E2=8C=A5`=20instead=20of=20`Alt`=20=20for=20all?=
 =?UTF-8?q?=20hotkeys=20used=20by=20this=20app=20on=20macOS=20(#103)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Views/Hotkeys.axaml     | 20 ++++++++++----------
 src/Views/Launcher.axaml    |  7 +++----
 src/Views/Launcher.axaml.cs | 12 ++++++++++--
 src/Views/Repository.axaml  |  2 +-
 src/Views/WorkingCopy.axaml |  4 ++--
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 09fa93fb..9f85fc3b 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -68,13 +68,13 @@
                    Margin="0,0,0,8"/>
 
         <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+T"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+W" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+Tab"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+>}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
@@ -88,19 +88,19 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+1"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+2"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+2, macOS=⌘+2}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewChanges}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="Ctrl+3"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+3, macOS=⌘+3}"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="SPACE"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="Space"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
 
           <TextBlock Grid.Row="5" Grid.Column="0" Classes="monospace bold" Text="F5"/>
@@ -114,10 +114,10 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Shift+F3"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Shift+F3, macOS=⇧+F3}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
 
           <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3"/>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 5b6003dd..f67f6ee0 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -203,7 +203,7 @@
                         <ToolTip.Tip>
                           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                             <TextBlock Text="{DynamicResource Text.PageTabBar.Tab.Close}" VerticalAlignment="Center"/>
-                            <TextBlock Margin="16,0,0,0" Text="Ctrl+W" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                            <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
                           </StackPanel>
                         </ToolTip.Tip>
                         <Path Width="8" Height="8" Data="{StaticResource Icons.Window.Close}"/>
@@ -226,12 +226,11 @@
             <Button Classes="icon_button"
                     Width="16" Height="16"
                     Margin="8,0"
-                    Command="{Binding AddNewTab}"
-                    HotKey="Ctrl+T">
+                    Command="{Binding AddNewTab}">
               <ToolTip.Tip>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                   <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
-                  <TextBlock Margin="16,0,0,0" Text="Ctrl+T" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                  <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+T, macOS=⌘+T}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
                 </StackPanel>
               </ToolTip.Tip>
               
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 2d3cf99c..c74d927a 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -98,7 +98,8 @@ namespace SourceGit.Views
         protected override void OnKeyDown(KeyEventArgs e)
         {
             var vm = DataContext as ViewModels.Launcher;
-            if (e.KeyModifiers.HasFlag(KeyModifiers.Control))
+            if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Meta)) ||
+                (!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Control)))
             {
                 if (e.Key == Key.W)
                 {
@@ -106,7 +107,14 @@ namespace SourceGit.Views
                     e.Handled = true;
                     return;
                 }
-                else if (e.Key == Key.Tab)
+                else if (e.Key == Key.T)
+                {
+                    vm.AddNewTab();
+                    e.Handled = true;
+                    return;
+                }
+                else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) || 
+                    (!OperatingSystem.IsMacOS() && e.Key == Key.Tab))
                 {
                     vm.GotoNextTab();
                     e.Handled = true;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 8a0ec5ce..1423807d 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -32,7 +32,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.Repository.Search}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="Ctrl+F" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+F, macOS=⌘+F}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 0dded0ad..637232e2 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -47,7 +47,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Unstaged.Stage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
@@ -183,7 +183,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Staged.Unstage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>