feat(key): add ToggleSidebarShowSecondary, ToggleSidebarShowOriginalText keys for sidebar

Author: umlx5h

LLPlayer/Services/AppActions.cs

@@ -71,6 +71,8 @@ private Dictionary<CustomKeyBindingAction, Action> GetCustomActions()
             [CustomKeyBindingAction.SubsPrimaryTextCopy] = () => CmdSubsPrimaryTextCopy.Execute(false),
             [CustomKeyBindingAction.SubsSecondaryTextCopy] = () => CmdSubsSecondaryTextCopy.Execute(false),
             [CustomKeyBindingAction.ToggleSubsAutoTextCopy] = CmdToggleSubsAutoTextCopy.Execute,
+            [CustomKeyBindingAction.ToggleSidebarShowSecondary] = CmdToggleSidebarShowSecondary.Execute,
+            [CustomKeyBindingAction.ToggleSidebarShowOriginalText] = CmdToggleSidebarShowOriginalText.Execute,
 
             [CustomKeyBindingAction.ToggleSidebar] = CmdToggleSidebar.Execute,
             [CustomKeyBindingAction.ToggleDebugOverlay] = CmdToggleDebugOverlay.Execute,
@@ -346,6 +348,16 @@ private void SubsTextCopyInternal(int subIndex, bool? suppressOsd)
         _config.Subs.SubsAutoTextCopy = !_config.Subs.SubsAutoTextCopy;
     });
 
+    public DelegateCommand CmdToggleSidebarShowSecondary => field ?? new(() =>
+    {
+        _config.SidebarShowSecondary = !_config.SidebarShowSecondary;
+    });
+
+    public DelegateCommand CmdToggleSidebarShowOriginalText => field ?? new(() =>
+    {
+        _config.SidebarShowOriginalText = !_config.SidebarShowOriginalText;
+    });
+
     public DelegateCommand CmdToggleSidebar => field ?? new(() =>
     {
         _config.ShowSidebar = !_config.ShowSidebar;
@@ -664,6 +676,11 @@ public enum CustomKeyBindingAction
     [Description("Toggle Auto Subtitles Text Copy")]
     ToggleSubsAutoTextCopy,
 
+    [Description("Toggle Primary / Secondary in Subtitles Sidebar")]
+    ToggleSidebarShowSecondary,
+    [Description("Toggle to show original text in Subtitles Sidebar")]
+    ToggleSidebarShowOriginalText,
+
     [Description("Toggle Subitltes Sidebar")]
     ToggleSidebar,
     [Description("Toggle Debug Overlay")]
@@ -736,6 +753,8 @@ public static KeyBindingActionGroup ToGroup(this CustomKeyBindingAction action)
             case CustomKeyBindingAction.SubsPrimaryTextCopy:
             case CustomKeyBindingAction.SubsSecondaryTextCopy:
             case CustomKeyBindingAction.ToggleSubsAutoTextCopy:
+            case CustomKeyBindingAction.ToggleSidebarShowSecondary:
+            case CustomKeyBindingAction.ToggleSidebarShowOriginalText:
                 return KeyBindingActionGroup.Subtitles;
 
             case CustomKeyBindingAction.ToggleSidebar:

LLPlayer/Services/AppConfig.cs

@@ -121,6 +121,9 @@ public bool ShowDebug
 
     public int SidebarSubPadding { get; set => Set(ref field, value); } = 5;
 
+    [JsonIgnore]
+    public bool SidebarShowSecondary { get; set => Set(ref field, value); }
+
     public bool SidebarShowOriginalText { get; set => Set(ref field, value); }
 
     public bool SidebarTextMask { get; set => Set(ref field, value); }

LLPlayer/ViewModels/SubtitlesSidebarVM.cs

@@ -1,43 +1,48 @@
-using FlyleafLib;
+using System.ComponentModel;
+using FlyleafLib;
 using FlyleafLib.MediaPlayer;
 using LLPlayer.Extensions;
 using LLPlayer.Services;
 
 namespace LLPlayer.ViewModels;
 
-public class SubtitlesSidebarVM : Bindable
+public class SubtitlesSidebarVM : Bindable, IDisposable
 {
     public FlyleafManager FL { get; }
 
     public SubtitlesSidebarVM(FlyleafManager fl)
     {
         FL = fl;
+
+        FL.Config.PropertyChanged += OnConfigOnPropertyChanged;
     }
 
-    public bool IsPrimary
+    private void OnConfigOnPropertyChanged(object? sender, PropertyChangedEventArgs args)
     {
-        get;
-        set
+        switch (args.PropertyName)
         {
-            if (Set(ref field, value))
-            {
+            case nameof(FL.Config.SidebarShowSecondary):
                 OnPropertyChanged(nameof(SubIndex));
                 OnPropertyChanged(nameof(SubManager));
-            }
+                break;
+            case nameof(FL.Config.SidebarShowOriginalText):
+                // Update ListBox
+                OnPropertyChanged(nameof(SubManager));
+                break;
         }
-    } = true;
+    }
 
-    public int SubIndex => IsPrimary ? 0 : 1;
+    public void Dispose()
+    {
+        FL.Config.PropertyChanged -= OnConfigOnPropertyChanged;
+    }
+
+    public int SubIndex => !FL.Config.SidebarShowSecondary ? 0 : 1;
 
     public SubManager SubManager => FL.Player.SubtitlesManager[SubIndex];
 
     // ReSharper disable NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
 
-    public DelegateCommand CmdSubIndexToggle => field ??= new(() =>
-    {
-        IsPrimary = !IsPrimary;
-    });
-
     // TODO: L: Fix implicit changes to reflect
     public DelegateCommand<string> CmdSubFontSizeChange => field ??= new(increase =>
     {
@@ -55,14 +60,6 @@ public bool IsPrimary
         OnPropertyChanged(nameof(SubManager));
     });
 
-    public DelegateCommand CmdShowOriginalTextToggle => field ??= new(() =>
-    {
-        FL.Config.SidebarShowOriginalText = !FL.Config.SidebarShowOriginalText;
-
-        // Update ListBox
-        OnPropertyChanged(nameof(SubManager));
-    });
-
     public DelegateCommand CmdShowDownloadSubsDialog => field ??= new(() =>
     {
         FL.Action.CmdOpenWindowSubsDownloader.Execute();

LLPlayer/Views/SubtitlesSidebar.xaml

@@ -81,11 +81,11 @@
             <!-- Primary Secondary Toggle -->
             <ToggleButton
                 Style="{StaticResource ToggleButton}"
-                materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=Numeric1BoxMultipleOutline}"
-                Content="{materialDesign:PackIcon Kind=Numeric2BoxMultipleOutline}"
+                materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=Numeric2BoxMultipleOutline}"
+                Content="{materialDesign:PackIcon Kind=Numeric1BoxMultipleOutline}"
                 ToolTip="Toggle Primary / Secondary"
-                Command="{Binding CmdSubIndexToggle}"
-                IsChecked="{Binding IsPrimary, Mode=OneWay}" />
+                Command="{Binding FL.Action.CmdToggleSidebarShowSecondary}"
+                IsChecked="{Binding FL.Config.SidebarShowSecondary, Mode=OneWay}" />
 
             <!-- Font Size -->
             <materialDesign:PopupBox
@@ -141,7 +141,7 @@
                 materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=TranslateOff}"
                 Content="{materialDesign:PackIcon Kind=Translate}"
                 ToolTip="Toggle to show original text when translating enabled"
-                Command="{Binding CmdShowOriginalTextToggle}"
+                Command="{Binding FL.Action.CmdToggleSidebarShowOriginalText}"
                 IsChecked="{Binding FL.Config.SidebarShowOriginalText, Mode=OneWay}" />
 
             <!-- Subtitles Downloader -->

LLPlayer/Views/SubtitlesSidebar.xaml.cs

@@ -12,6 +12,14 @@ public SubtitlesSidebar()
         InitializeComponent();
 
         DataContext = ((App)Application.Current).Container.Resolve<SubtitlesSidebarVM>();
+
+        Unloaded += (sender, args) =>
+        {
+            if (DataContext is SubtitlesSidebarVM vm)
+            {
+                vm.Dispose();
+            }
+        };
     }
 
     /// <summary>