localize access keys

huynhsontung · Jul 14, 2024 · bde6b4b · bde6b4b
1 parent 0e5a7f0
commit bde6b4b
Show file tree

Hide file tree

Showing 21 changed files with 1,156 additions and 81 deletions.
diff --git a/Screenbox/Controls/Interactions/NavigationViewAccessKeysBehavior.cs b/Screenbox/Controls/Interactions/NavigationViewAccessKeysBehavior.cs
@@ -86,7 +86,7 @@ protected override void OnAssociatedObjectLoaded()
 
         if (AssociatedObject.FindDescendant<Button>(btn => btn.Name == "NavigationViewBackButton") is { } navigationViewBackButton)
         {
-            navigationViewBackButton.AccessKey = "B";
+            navigationViewBackButton.AccessKey = Strings.KeyboardResources.NavBackButtonKey;
             navigationViewBackButton.KeyTipPlacementMode = KeyTipPlacementMode.Right;
             //navigationViewBackButton.AccessKey = BackButtonAccessKey;
             //navigationViewBackButton.KeyTipPlacementMode = BackButtonKeyTipPlacementMode;
@@ -95,15 +95,15 @@ protected override void OnAssociatedObjectLoaded()
 
         if (AssociatedObject.FindDescendant<Button>(btn => btn.Name == "NavigationViewCloseButton") is { } navigationViewCloseButton)
         {
-            navigationViewCloseButton.AccessKey = "B";
+            navigationViewCloseButton.AccessKey = Strings.KeyboardResources.NavCloseButtonKey;
             navigationViewCloseButton.KeyTipPlacementMode = KeyTipPlacementMode.Bottom;
             //navigationViewCloseButton.AccessKey = CloseButtonAccessKey;
             //navigationViewCloseButton.KeyTipPlacementMode = CloseButtonKeyTipPlacementMode;
         }
 
         if (AssociatedObject.FindDescendant<Button>(btn => btn.Name == "TogglePaneButton") is { } togglePaneButton)
         {
-            togglePaneButton.AccessKey = "NE";
+            togglePaneButton.AccessKey = Strings.KeyboardResources.NavToggleMenuPaneButtonKey;
             togglePaneButton.KeyTipPlacementMode = KeyTipPlacementMode.Right;
             //togglePaneButton.AccessKey = TogglePaneButtonAccessKey;
             //togglePaneButton.KeyTipPlacementMode = TogglePaneButtonKeyTipPlacementMode;
@@ -112,7 +112,7 @@ protected override void OnAssociatedObjectLoaded()
 
         if (AssociatedObject.FindDescendant<Button>(btn => btn.Name == "PaneAutoSuggestButton") is { } paneAutoSuggestButton)
         {
-            paneAutoSuggestButton.AccessKey = "NF";
+            paneAutoSuggestButton.AccessKey = Strings.KeyboardResources.NavAutoSuggestButtonKey;
             paneAutoSuggestButton.KeyTipPlacementMode = KeyTipPlacementMode.Right;
             paneAutoSuggestButton.IsTextScaleFactorEnabled = false;
             //paneAutoSuggestButton.AccessKey = PaneAutoSuggestButtonAccessKey;

diff --git a/Screenbox/Controls/PlayerControls.xaml b/Screenbox/Controls/PlayerControls.xaml
@@ -97,7 +97,7 @@
 
             <MenuFlyout x:Key="NormalPlayerContextMenu">
                 <MenuFlyoutItem
-                    AccessKey="F"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemFileKey}"
                     Command="{x:Bind Common.OpenFilesCommand}"
                     Icon="{ui:FontIcon Glyph=&#xE838;}"
                     KeyTipPlacementMode="Left"
@@ -108,7 +108,7 @@
                 </MenuFlyoutItem>
                 <MenuFlyoutSeparator />
                 <MenuFlyoutItem
-                    AccessKey="P"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemPropertiesKey}"
                     Command="{StaticResource ShowPropertiesCommand}"
                     CommandParameter="{x:Bind ViewModel.Playlist.CurrentItem, Mode=OneWay}"
                     Icon="{ui:FontIcon Glyph=&#xE946;}"
@@ -120,7 +120,7 @@
                 </MenuFlyoutItem>
                 <MenuFlyoutSubItem
                     x:Name="PlaybackSpeedSubMenu"
-                    AccessKey="S"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemSpeedKey}"
                     KeyTipPlacementMode="Left"
                     Text="{x:Bind strings:Resources.PlaybackSpeed}">
                     <MenuFlyoutSubItem.Icon>
@@ -191,14 +191,14 @@
                         Text="{strings:Resources Key=Custom}" />
                 </MenuFlyoutSubItem>
                 <MenuFlyoutItem
-                    AccessKey="N"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemSaveSnapshotKey}"
                     Command="{x:Bind ViewModel.SaveSnapshotCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
                                        Glyph=&#xEE71;}"
                     Text="{x:Bind strings:Resources.SaveCurrentFrame}"
                     Visibility="{x:Bind helpers:SystemInformation.IsDesktop}" />
                 <MenuFlyoutItem
-                    AccessKey="C"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemCastKey}"
                     Click="CastMenuFlyoutItem_OnClick"
                     Icon="{ui:FontIcon Glyph=&#xEC15;}"
                     IsEnabled="{x:Bind IsCastButtonEnabled(ViewModel.HasActiveItem), Mode=OneWay}"
@@ -210,7 +210,7 @@
                 </MenuFlyoutItem>
                 <MenuFlyoutSubItem
                     x:Name="AspectRatioSubMenu"
-                    AccessKey="R"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemAspectRatioKey}"
                     Icon="{ui:FontIcon Glyph=&#xE799;}"
                     IsEnabled="{x:Bind ViewModel.HasVideo, Mode=OneWay}"
                     Text="{strings:Resources Key=AspectRatio}">
@@ -270,7 +270,7 @@
                 </MenuFlyoutSubItem>-->
 
                 <MenuFlyoutItem
-                    AccessKey="A"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemAdvancedKey}"
                     CommandParameter="{x:Bind ViewModel.Playlist.CurrentItem, Mode=OneWay}"
                     Icon="{ui:SymbolIcon Symbol=Setting}"
                     IsEnabled="{x:Bind ViewModel.HasActiveItem, Mode=OneWay}"
@@ -284,7 +284,7 @@
                 <MenuFlyoutSeparator x:Name="ExtraOptionsSeparator" Visibility="Collapsed" />
                 <MenuFlyoutItem
                     x:Name="CompactOverlayMenuItem"
-                    AccessKey="Y"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemCompactOverlayKey}"
                     Command="{x:Bind ViewModel.ToggleCompactLayoutCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource ScreenboxSymbolThemeFontFamily},
                                        Glyph=&#xEE49;}"
@@ -300,7 +300,7 @@
                 </MenuFlyoutItem>
                 <MenuFlyoutItem
                     x:Name="FullscreenMenuItem"
-                    AccessKey="U"
+                    AccessKey="{strings:KeyboardResources Key=MenuItemFullscreenKey}"
                     Command="{x:Bind ViewModel.ToggleFullscreenCommand}"
                     Icon="{ui:FontIcon Glyph=&#xE740;}"
                     Text="{x:Bind strings:Resources.FullscreenToggle(ViewModel.IsFullscreen), Mode=OneWay}"
@@ -352,21 +352,21 @@
                 x:Name="PlayPauseButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind ViewModel.IsPlaying, Converter={StaticResource BoolToPlayPauseTextConverter}, Mode=OneWay}"
-                AccessKey="P"
+                AccessKey="{strings:KeyboardResources Key=PlayerPlayPauseKey}"
                 Command="{x:Bind ViewModel.PlayPauseCommand}"
                 Style="{StaticResource PlayerButtonStyle}">
+                <FontIcon Glyph="{x:Bind ViewModel.IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}, Mode=OneWay}" />
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="P" Invoked="{x:Bind ViewModel.PlayPauseKeyboardAccelerator_OnInvoked}" />
                     <KeyboardAccelerator Key="K" Invoked="{x:Bind ViewModel.PlayPauseKeyboardAccelerator_OnInvoked}" />
                     <KeyboardAccelerator Key="Space" Invoked="{x:Bind ViewModel.PlayPauseKeyboardAccelerator_OnInvoked}" />
                 </Button.KeyboardAccelerators>
-                <FontIcon Glyph="{x:Bind ViewModel.IsPlaying, Converter={StaticResource PlayPauseGlyphConverter}, Mode=OneWay}" />
             </Button>
             <!--  Previous/Next  -->
             <Button
                 x:Name="PreviousButton"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.Previous}"
-                AccessKey="R"
+                AccessKey="{strings:KeyboardResources Key=PlayerPreviousKey}"
                 Command="{x:Bind ViewModel.Playlist.PreviousCommand}"
                 CornerRadius="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
                 Style="{StaticResource PlayerButtonStyle}">
@@ -378,7 +378,7 @@
             <Button
                 x:Name="NextButton"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.Next}"
-                AccessKey="X"
+                AccessKey="{strings:KeyboardResources Key=PlayerNextKey}"
                 Command="{x:Bind ViewModel.Playlist.NextCommand}"
                 CornerRadius="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}"
                 Style="{StaticResource PlayerButtonStyle}">
@@ -410,15 +410,15 @@
                 x:Name="VolumeButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.Volume}"
-                AccessKey="V"
+                AccessKey="{strings:KeyboardResources Key=PlayerVolumeButtonSliderKey}"
                 Flyout="{StaticResource VolumeControlFlyout}"
                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}"
                 Style="{StaticResource PlayerButtonStyle}"
                 Visibility="Collapsed">
+                <FontIcon Glyph="{x:Bind VolumeControl.ViewModel.VolumeGlyph, Mode=OneWay}" />
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="M" />
                 </Button.KeyboardAccelerators>
-                <FontIcon Glyph="{x:Bind VolumeControl.ViewModel.VolumeGlyph, Mode=OneWay}" />
             </Button>
             <controls:VolumeControl
                 x:Name="VolumeControl"
@@ -431,7 +431,7 @@
                 x:Name="ShuffleButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.ShuffleMode(ViewModel.Playlist.ShuffleMode), Mode=OneWay}"
-                AccessKey="H"
+                AccessKey="{strings:KeyboardResources Key=PlayerShuffleKey}"
                 IsChecked="{x:Bind ViewModel.Playlist.ShuffleMode, Mode=TwoWay}"
                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}"
                 Style="{StaticResource PlayerToggleButtonStyle}">
@@ -445,7 +445,7 @@
                 x:Name="RepeatButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.RepeatMode(ViewModel.Playlist.RepeatMode), Mode=OneWay}"
-                AccessKey="E"
+                AccessKey="{strings:KeyboardResources Key=PlayerRepeatKey}"
                 IsChecked="{x:Bind ViewModel.Playlist.RepeatMode, Converter={StaticResource ToggleButtonCheckToRepeatModeConverter}, Mode=TwoWay}"
                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}"
                 IsThreeState="True"
@@ -460,7 +460,7 @@
                 x:Name="AudioAndCaptionButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.AudioAndCaption}"
-                AccessKey="A"
+                AccessKey="{strings:KeyboardResources Key=PlayerAudioAndCaptionsKey}"
                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}"
                 Style="{StaticResource PlayerButtonStyle}">
                 <FontIcon Glyph="&#xED1F;" />
@@ -490,38 +490,38 @@
                 x:Name="CompactOverlayButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.CompactOverlayToggle(ViewModel.IsCompact), Mode=OneWay}"
-                AccessKey="Y"
+                AccessKey="{strings:KeyboardResources Key=PlayerCompactOverlayKey}"
                 Command="{x:Bind ViewModel.ToggleCompactLayoutCommand}"
                 Style="{StaticResource PlayerButtonStyle}"
                 Visibility="{x:Bind helpers:SystemInformation.IsDesktop}">
-                <Button.KeyboardAccelerators>
-                    <KeyboardAccelerator Key="M" Modifiers="Control" />
-                    <KeyboardAccelerator Key="Escape" IsEnabled="{x:Bind ViewModel.IsCompact, Mode=OneWay}" />
-                </Button.KeyboardAccelerators>
                 <FontIcon
                     x:Name="CompactOverlayButtonIcon"
                     contract13NotPresent:FontFamily="{StaticResource ScreenboxSymbolThemeFontFamily}"
                     Glyph="&#xEE49;" />
+                <Button.KeyboardAccelerators>
+                    <KeyboardAccelerator Key="M" Modifiers="Control" />
+                    <KeyboardAccelerator Key="Escape" IsEnabled="{x:Bind ViewModel.IsCompact, Mode=OneWay}" />
+                </Button.KeyboardAccelerators>
             </Button>
             <!--  Fullscreen  -->
             <Button
                 x:Name="FullscreenButton"
                 Margin="0,0,4,0"
                 controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.FullscreenToggle(ViewModel.IsFullscreen), Mode=OneWay}"
-                AccessKey="F"
+                AccessKey="{strings:KeyboardResources Key=PlayerFullscreenKey}"
                 Command="{x:Bind ViewModel.ToggleFullscreenCommand}"
                 Style="{StaticResource PlayerButtonStyle}"
                 Visibility="{x:Bind helpers:SystemInformation.IsDesktop}">
+                <FontIcon x:Name="FullscreenButtonIcon" Glyph="&#xE740;" />
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="F" />
                     <KeyboardAccelerator Key="Escape" IsEnabled="{x:Bind ViewModel.IsFullscreen, Mode=OneWay}" />
                 </Button.KeyboardAccelerators>
-                <FontIcon x:Name="FullscreenButtonIcon" Glyph="&#xE740;" />
             </Button>
             <!--  More  -->
             <Button
                 x:Name="MoreButton"
-                AccessKey="O"
+                AccessKey="{strings:KeyboardResources Key=PlayerMoreKey}"
                 Flyout="{StaticResource NormalPlayerContextMenu}"
                 IsAccessKeyScope="True"
                 IsEnabled="{x:Bind IsEnabled, Mode=OneWay}"

diff --git a/Screenbox/Controls/PlaylistView.xaml b/Screenbox/Controls/PlaylistView.xaml
@@ -88,10 +88,12 @@
             Grid.Row="0"
             MinHeight="50"
             Padding="{x:Bind Padding, Mode=OneWay}"
+            KeyTipPlacementMode="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="AddFilesButton"
                 Margin="0,0,12,0"
+                AccessKey="{strings:KeyboardResources Key=CommandAddOpenFilesKey}"
                 Command="{x:Bind ViewModel.AddFilesCommand}"
                 Visibility="Collapsed">
                 <StackPanel Orientation="Horizontal">
@@ -104,9 +106,10 @@
                 x:Name="ClearButton"
                 Margin="0,0,12,0"
                 VerticalAlignment="Center"
-                AccessKey="CL"
+                AccessKey="{strings:KeyboardResources Key=CommandClearKey}"
                 Command="{x:Bind ViewModel.Playlist.ClearCommand}"
-                IsEnabled="{x:Bind ViewModel.HasItems, Mode=OneWay}">
+                IsEnabled="{x:Bind ViewModel.HasItems, Mode=OneWay}"
+                KeyTipPlacementMode="Bottom">
                 <StackPanel Orientation="Horizontal">
                     <FontIcon Glyph="&#xE74D;" />
                     <TextBlock
@@ -119,8 +122,10 @@
             <ToggleButton
                 x:Name="MultiSelectToggle"
                 VerticalAlignment="Center"
+                AccessKey="{strings:KeyboardResources Key=CommandMultiSelectKey}"
                 IsChecked="{x:Bind ViewModel.EnableMultiSelect, Mode=TwoWay}"
                 IsEnabled="{x:Bind ViewModel.HasItems, Mode=OneWay}"
+                KeyTipPlacementMode="Bottom"
                 XYFocusLeft="{x:Bind ClearButton}">
                 <StackPanel Orientation="Horizontal">
                     <FontIcon Glyph="&#xE762;" />

diff --git a/Screenbox/Controls/SeekBar.xaml b/Screenbox/Controls/SeekBar.xaml
@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:strings="using:Screenbox.Strings"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
@@ -40,7 +41,7 @@
             x:Name="SeekBarSlider"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Center"
-            AccessKey="S"
+            AccessKey="{strings:KeyboardResources Key=PlayerSeekBarKey}"
             Background="{x:Bind Background, Mode=OneWay}"
             Foreground="{x:Bind Foreground, Mode=OneWay}"
             IsEnabled="{x:Bind ViewModel.IsSeekable, Mode=OneWay, FallbackValue=False}"

diff --git a/Screenbox/Controls/VolumeControl.xaml b/Screenbox/Controls/VolumeControl.xaml
@@ -43,7 +43,7 @@
             Grid.Column="0"
             Margin="0,0,4,0"
             controls:AcceleratorService.ToolTip="{x:Bind strings:Resources.MuteToggle(ViewModel.IsMute), Mode=OneWay}"
-            AccessKey="M"
+            AccessKey="{strings:KeyboardResources Key=PlayerMuteKey}"
             IsChecked="{x:Bind ViewModel.IsMute, Mode=TwoWay}"
             Style="{x:Bind ToggleButtonStyle, Mode=OneWay}">
             <FontIcon Glyph="{x:Bind ViewModel.VolumeGlyph, Mode=OneWay}" />
@@ -65,7 +65,7 @@
             x:Name="VolumeSlider"
             Grid.Column="1"
             VerticalAlignment="Center"
-            AccessKey="V"
+            AccessKey="{strings:KeyboardResources Key=PlayerVolumeButtonSliderKey}"
             IsThumbToolTipEnabled="{x:Bind ShowValueText, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
             Maximum="{x:Bind ViewModel.MaxVolume, Mode=OneWay}"
             PointerWheelChanged="{x:Bind ViewModel.OnPointerWheelChanged}"

diff --git a/Screenbox/Pages/AlbumDetailsPage.xaml b/Screenbox/Pages/AlbumDetailsPage.xaml
@@ -143,7 +143,7 @@
                     Spacing="16">
                     <Button
                         x:Name="PlayButton"
-                        AccessKey="CA"
+                        AccessKey="{strings:KeyboardResources Key=CommandPlayKey}"
                         AutomationProperties.Name="{strings:Resources Key=Play}"
                         Command="{x:Bind ViewModel.PlayCommand}"
                         CommandParameter="{x:Bind ViewModel.SortedItems, Mode=OneWay, Converter={StaticResource FirstOrDefaultConverter}}"
@@ -159,7 +159,7 @@
                     </Button>
 
                     <Button
-                        AccessKey="CH"
+                        AccessKey="{strings:KeyboardResources Key=CommandShuffleAndPlayKey}"
                         AutomationProperties.Name="{strings:Resources Key=ShuffleAndPlay}"
                         Command="{x:Bind ViewModel.ShuffleAndPlayCommand}"
                         XYFocusDown="{x:Bind ItemList}">