Fix subtitle selection

Tyrrrz · Oct 25, 2020 · 3942c96 · 3942c96
1 parent 3da013e
commit 3942c96
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/YoutubeDownloader/ViewModels/Dialogs/DownloadSingleSetupViewModel.cs b/YoutubeDownloader/ViewModels/Dialogs/DownloadSingleSetupViewModel.cs
@@ -31,6 +31,8 @@ public class DownloadSingleSetupViewModel : DialogScreen<DownloadViewModel>
 
         public SubtitleDownloadOption? SelectedSubtitleOption { get; set; }
 
+        public bool ShouldDownloadSubtitles { get; set; }
+
         public DownloadSingleSetupViewModel(
             IViewModelFactory viewModelFactory,
             SettingsService settingsService,
@@ -51,7 +53,8 @@ public void OnViewLoaded()
             // Select first subtitle download option matching last used language
             SelectedSubtitleOption =
                 AvailableSubtitleOptions.FirstOrDefault(o =>
-                    o.TrackInfo.Language.Code == _settingsService.LastSubtitleLanguageCode);
+                    o.TrackInfo.Language.Code == _settingsService.LastSubtitleLanguageCode) ??
+                AvailableSubtitleOptions.FirstOrDefault();
         }
 
         public bool CanConfirm => SelectedVideoOption != null;
@@ -81,7 +84,7 @@ public void Confirm()
                 filePath,
                 format,
                 SelectedVideoOption,
-                SelectedSubtitleOption
+                ShouldDownloadSubtitles ? SelectedSubtitleOption : null
             );
 
             // Create empty file to "lock in" the file path.

diff --git a/YoutubeDownloader/Views/Dialogs/DownloadMultipleSetupView.xaml b/YoutubeDownloader/Views/Dialogs/DownloadMultipleSetupView.xaml
@@ -130,7 +130,7 @@
                     VerticalAlignment="Center"
                     Text="Format:" />
                 <ComboBox
-                    MinWidth="150"
+                    Width="150"
                     Margin="8"
                     VerticalAlignment="Center"
                     IsReadOnly="True"
@@ -148,7 +148,7 @@
                     VerticalAlignment="Center"
                     Text="Video quality:" />
                 <ComboBox
-                    MinWidth="150"
+                    Width="150"
                     Margin="8"
                     VerticalAlignment="Center"
                     IsReadOnly="True"

diff --git a/YoutubeDownloader/Views/Dialogs/DownloadSingleSetupView.xaml b/YoutubeDownloader/Views/Dialogs/DownloadSingleSetupView.xaml
@@ -90,7 +90,7 @@
                     VerticalAlignment="Center"
                     Text="Format:" />
                 <ComboBox
-                    MinWidth="150"
+                    Width="150"
                     Margin="8"
                     VerticalAlignment="Center"
                     materialDesign:ComboBoxAssist.ShowSelectedItem="True"
@@ -105,16 +105,15 @@
                 IsEnabled="{Binding AvailableSubtitleOptions}"
                 Orientation="Horizontal">
                 <CheckBox
-                    x:Name="SubtitlesCheckBox"
                     Margin="8"
                     VerticalAlignment="Center"
                     Content="Subtitles:"
-                    Unchecked="SubtitlesCheckBox_OnUnchecked" />
+                    IsChecked="{Binding ShouldDownloadSubtitles}" />
                 <ComboBox
-                    MinWidth="150"
+                    Width="150"
                     Margin="8"
                     materialDesign:ComboBoxAssist.ShowSelectedItem="True"
-                    IsEnabled="{Binding IsChecked, ElementName=SubtitlesCheckBox}"
+                    IsEnabled="{Binding ShouldDownloadSubtitles}"
                     IsReadOnly="True"
                     ItemsSource="{Binding AvailableSubtitleOptions}"
                     SelectedItem="{Binding SelectedSubtitleOption}" />

diff --git a/YoutubeDownloader/Views/Dialogs/DownloadSingleSetupView.xaml.cs b/YoutubeDownloader/Views/Dialogs/DownloadSingleSetupView.xaml.cs
@@ -1,19 +1,10 @@
-using System.Windows;
-using YoutubeDownloader.ViewModels.Dialogs;
-
-namespace YoutubeDownloader.Views.Dialogs
+namespace YoutubeDownloader.Views.Dialogs
 {
     public partial class DownloadSingleSetupView
     {
         public DownloadSingleSetupView()
         {
             InitializeComponent();
         }
-
-        private void SubtitlesCheckBox_OnUnchecked(object sender, RoutedEventArgs args)
-        {
-            if (DataContext is DownloadSingleSetupViewModel vm)
-                vm.SelectedSubtitleOption = null;
-        }
     }
 }