Added support for PreferSoftSubtitles to Config screen.

kmcclive · Apr 19, 2021 · 0e2eed1 · 0e2eed1
1 parent f565ad1
commit 0e2eed1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Tricycle.UI.Tests/ViewModels/ConfigViewModelTests.cs b/Tricycle.UI.Tests/ViewModels/ConfigViewModelTests.cs
@@ -112,12 +112,12 @@ public void LoadsPreferForcedSubtitlesFromConfig()
         }
 
         [TestMethod]
-        public void LoadsOverlaySubtitlesFromConfig()
+        public void LoadsPreferSoftSubtitlesFromConfig()
         {
             _tricycleConfig.PreferSoftSubtitles = true;
             _viewModel.Initialize();
 
-            Assert.AreEqual(_tricycleConfig.PreferSoftSubtitles, _viewModel.OverlaySubtitles);
+            Assert.AreEqual(_tricycleConfig.PreferSoftSubtitles, _viewModel.PreferSoftSubtitles);
         }
 
         [TestMethod]
@@ -970,15 +970,15 @@ public void SavesPreferForcedSubtitlesToConfig()
         }
 
         [TestMethod]
-        public void SavesOverlaySubtitlesToConfig()
+        public void SavesPreferSoftSubtitlesToConfig()
         {
-            bool overlaySubtitles = true;
+            bool preferSoftSubtitles = true;
 
             _viewModel.Initialize();
-            _viewModel.OverlaySubtitles = overlaySubtitles;
+            _viewModel.PreferSoftSubtitles = preferSoftSubtitles;
             _viewModel.Close();
 
-            Assert.AreEqual(overlaySubtitles, _tricycleConfigManager.Config?.PreferSoftSubtitles);
+            Assert.AreEqual(preferSoftSubtitles, _tricycleConfigManager.Config?.PreferSoftSubtitles);
         }
 
         [TestMethod]

diff --git a/Tricycle.UI/ViewModels/ConfigViewModel.cs b/Tricycle.UI/ViewModels/ConfigViewModel.cs
@@ -45,7 +45,7 @@ public class ConfigViewModel : ViewModelBase
         bool _alertOnCompletion;
         bool _deleteIncompleteFiles;
         bool _preferForcedSubtitles;
-        bool _overlaySubtitles;
+        bool _preferSoftSubtitles;
         string _mp4FileExtension;
         string _mkvFileExtension;
         string _destinationDirectory;
@@ -166,10 +166,10 @@ public bool PreferForcedSubtitles
             set => SetProperty(ref _preferForcedSubtitles, value);
         }
 
-        public bool OverlaySubtitles
+        public bool PreferSoftSubtitles
         {
-            get => _overlaySubtitles;
-            set => SetProperty(ref _overlaySubtitles, value);
+            get => _preferSoftSubtitles;
+            set => SetProperty(ref _preferSoftSubtitles, value);
         }
 
         public string Mp4FileExtension
@@ -406,7 +406,7 @@ void Load(TricycleConfig config)
             AlertOnCompletion = config.CompletionAlert;
             DeleteIncompleteFiles = config.DeleteIncompleteFiles;
             PreferForcedSubtitles = config.ForcedSubtitlesOnly;
-            OverlaySubtitles = config.PreferSoftSubtitles;
+            PreferSoftSubtitles = config.PreferSoftSubtitles;
             Mp4FileExtension = config.DefaultFileExtensions?.GetValueOrDefault(ContainerFormat.Mp4);
             MkvFileExtension = config.DefaultFileExtensions?.GetValueOrDefault(ContainerFormat.Mkv);
             SelectedDestinationDirectoryMode = new ListItem(config.DestinationDirectoryMode);
@@ -578,7 +578,7 @@ TricycleConfig GenerateTricycleConfig()
                 CompletionAlert = AlertOnCompletion,
                 DeleteIncompleteFiles = DeleteIncompleteFiles,
                 ForcedSubtitlesOnly = PreferForcedSubtitles,
-                PreferSoftSubtitles = OverlaySubtitles,
+                PreferSoftSubtitles = PreferSoftSubtitles,
                 Audio = GenerateTricycleAudioConfig(),
                 Video = GenerateTricycleVideoConfig(),
                 DefaultFileExtensions = new Dictionary<ContainerFormat, string>()

diff --git a/Tricycle.UI/Views/GeneralConfigSection.xaml b/Tricycle.UI/Views/GeneralConfigSection.xaml
@@ -15,8 +15,8 @@
             <Switch IsToggled="{Binding DeleteIncompleteFiles}" VerticalOptions="Center" Grid.Column="1" Grid.Row="1" />
             <Label Text="Prefer forced subtitles" VerticalOptions="Center" Grid.Column="0" Grid.Row="2" />
             <Switch IsToggled="{Binding PreferForcedSubtitles}" VerticalOptions="Center" Grid.Column="1" Grid.Row="2" />
-            <Label Text="Overlay subtitles" VerticalOptions="Center" Grid.Column="0" Grid.Row="3" />
-            <Switch IsToggled="{Binding OverlaySubtitles}" VerticalOptions="Center" Grid.Column="1" Grid.Row="3" />
+            <Label Text="Use soft subtitles when supported" VerticalOptions="Center" Grid.Column="0" Grid.Row="3" />
+            <Switch IsToggled="{Binding PreferSoftSubtitles}" VerticalOptions="Center" Grid.Column="1" Grid.Row="3" />
             <Label Text="MP4 file extension" VerticalOptions="Center" Grid.Column="0" Grid.Row="4" />
             <Entry Text="{Binding Mp4FileExtension}" Grid.Column="1" Grid.Row="4" />
             <Label Text="MKV file extension" VerticalOptions="Center" Grid.Column="0" Grid.Row="5" />