summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs5
-rw-r--r--win/CS/HandBrakeWPF/UserSettingConstants.cs2
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs35
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs48
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs167
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml15
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml2
-rw-r--r--win/CS/HandBrakeWPF/Views/SubtitlesView.xaml15
-rw-r--r--win/CS/HandBrakeWPF/defaultsettings.xml2
-rw-r--r--win/CS/defaultsettings.xml2
11 files changed, 209 insertions, 86 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
index 9ad24a1f9..c15b9db02 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
@@ -82,7 +82,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
{
get
{
- return this.SrtFileName != "-";
+ return this.SrtFileName != "-" && this.SrtFileName != null;
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 91d4d5357..a018c9900 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -416,6 +416,11 @@ namespace HandBrake.ApplicationServices.Utilities
/// </param>
public static void Export(string path, Preset preset)
{
+ if (string.IsNullOrEmpty(path))
+ {
+ return;
+ }
+
EncodeTask parsed = QueryParserUtility.Parse(preset.Query);
XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented };
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index ad0da6e70..99c31b74a 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -24,13 +24,11 @@ namespace HandBrakeWPF
public const string AutoNameFormat = "autoNameFormat";
public const string VLC_Path = "VLC_Path";
public const string MainWindowMinimize = "MainWindowMinimize";
- public const string QueryEditorTab = "QueryEditorTab";
public const string PresetNotification = "presetNotification";
public const string TrayIconAlerts = "trayIconAlerts";
public const string LastUpdateCheckDate = "lastUpdateCheckDate";
public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
public const string UseM4v = "useM4v";
- public const string PromptOnUnmatchingQueries = "PromptOnUnmatchingQueries";
public const string NativeLanguage = "NativeLanguage";
public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
public const string DubMode = "DubMode";
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 7d64cfb5e..e8e584f60 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -23,7 +23,6 @@ namespace HandBrakeWPF.ViewModels
using HandBrake.ApplicationServices;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
- using HandBrake.ApplicationServices.Model.General;
using HandBrake.ApplicationServices.Parsing;
using HandBrake.ApplicationServices.Services;
using HandBrake.ApplicationServices.Services.Interfaces;
@@ -231,7 +230,7 @@ namespace HandBrakeWPF.ViewModels
set
{
- if (!object.Equals(this.windowName, value))
+ if (!Equals(this.windowName, value))
{
this.windowName = value;
}
@@ -251,7 +250,7 @@ namespace HandBrakeWPF.ViewModels
set
{
- if (!object.Equals(this.programStatusLabel, value))
+ if (!Equals(this.programStatusLabel, value))
{
this.programStatusLabel = value;
this.NotifyOfPropertyChange("ProgramStatusLabel");
@@ -334,7 +333,7 @@ namespace HandBrakeWPF.ViewModels
set
{
- if (!object.Equals(this.sourceLabel, value))
+ if (!Equals(this.sourceLabel, value))
{
this.sourceLabel = value;
this.NotifyOfPropertyChange("SourceLabel");
@@ -395,6 +394,17 @@ namespace HandBrakeWPF.ViewModels
}
/// <summary>
+ /// Gets a value indicating whether ShowTextEntryForPointToPointMode.
+ /// </summary>
+ public bool ShowTextEntryForPointToPointMode
+ {
+ get
+ {
+ return this.SelectedPointToPoint != PointToPointMode.Chapters;
+ }
+ }
+
+ /// <summary>
/// Gets StartEndRangeItems.
/// </summary>
public IEnumerable<int> StartEndRangeItems
@@ -406,7 +416,7 @@ namespace HandBrakeWPF.ViewModels
return null;
}
- return this.SelectedTitle.Chapters.Select(item => item.ChapterNumber).Select(dummy => (int)dummy).ToList();
+ return this.SelectedTitle.Chapters.Select(item => item.ChapterNumber).Select(dummy => dummy).ToList();
}
}
@@ -509,7 +519,7 @@ namespace HandBrakeWPF.ViewModels
}
set
{
- if (!object.Equals(this.selectedTitle, value))
+ if (!Equals(this.selectedTitle, value))
{
this.selectedTitle = value;
@@ -604,7 +614,8 @@ namespace HandBrakeWPF.ViewModels
set
{
this.CurrentTask.PointToPointMode = value;
- this.NotifyOfPropertyChange("SelectedPointToPoint");
+ this.NotifyOfPropertyChange(() => SelectedPointToPoint);
+ this.NotifyOfPropertyChange(() => ShowTextEntryForPointToPointMode);
}
}
@@ -620,8 +631,8 @@ namespace HandBrakeWPF.ViewModels
set
{
this.selectedOutputFormat = value;
- this.NotifyOfPropertyChange("SelectedOutputFormat");
- this.NotifyOfPropertyChange("IsMkv");
+ this.NotifyOfPropertyChange(() => SelectedOutputFormat);
+ this.NotifyOfPropertyChange(() => IsMkv);
this.SetExtension(string.Format(".{0}", this.selectedOutputFormat.ToString().ToLower())); // TODO, tidy up
}
}
@@ -1110,12 +1121,16 @@ namespace HandBrakeWPF.ViewModels
/// </returns>
private string DurationCalculation()
{
+ if (this.selectedTitle == null)
+ {
+ return "--:--:--";
+ }
+
double startEndDuration = this.SelectedEndPoint - this.SelectedStartPoint;
switch (this.SelectedPointToPoint)
{
case PointToPointMode.Chapters:
return this.SelectedTitle.CalculateDuration(this.SelectedStartPoint, this.SelectedEndPoint).ToString();
- break;
case PointToPointMode.Seconds:
return TimeSpan.FromSeconds(startEndDuration).ToString();
case PointToPointMode.Frames:
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 4a9dd8aa4..673579915 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -149,11 +149,6 @@ namespace HandBrakeWPF.ViewModels
private bool enableGuiTooltips;
/// <summary>
- /// The enable query editor.
- /// </summary>
- private bool enableQueryEditor;
-
- /// <summary>
/// The growl after encode.
/// </summary>
private bool growlAfterEncode;
@@ -204,11 +199,6 @@ namespace HandBrakeWPF.ViewModels
private BindingList<string> priorityLevelOptions = new BindingList<string>();
/// <summary>
- /// The prompt on different query.
- /// </summary>
- private bool promptOnDifferentQuery;
-
- /// <summary>
/// The remove underscores.
/// </summary>
private bool removeUnderscores;
@@ -1040,40 +1030,6 @@ namespace HandBrakeWPF.ViewModels
#region Advanced
/// <summary>
- /// Gets or sets a value indicating whether EnableQueryEditor.
- /// </summary>
- public bool EnableQueryEditor
- {
- get
- {
- return this.enableQueryEditor;
- }
-
- set
- {
- this.enableQueryEditor = value;
- this.NotifyOfPropertyChange("EnableQueryEditor");
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether PromptOnDifferentQuery.
- /// </summary>
- public bool PromptOnDifferentQuery
- {
- get
- {
- return this.promptOnDifferentQuery;
- }
-
- set
- {
- this.promptOnDifferentQuery = value;
- this.NotifyOfPropertyChange("PromptOnDifferentQuery");
- }
- }
-
- /// <summary>
/// Gets or sets ConstantQualityGranularity.
/// </summary>
public BindingList<string> ConstantQualityGranularity
@@ -1435,8 +1391,6 @@ namespace HandBrakeWPF.ViewModels
// Minimise to Tray
this.displayStatusMessagesTrayIcon = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TrayIconAlerts);
this.minimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);
- this.enableQueryEditor = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.QueryEditorTab);
- this.promptOnDifferentQuery = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PromptOnUnmatchingQueries);
this.disablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);
this.showCliWindow = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI);
@@ -1676,8 +1630,6 @@ namespace HandBrakeWPF.ViewModels
/* Advanced */
userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);
userSettingService.SetUserSetting(UserSettingConstants.TrayIconAlerts, this.DisplayStatusMessagesTrayIcon);
- userSettingService.SetUserSetting(UserSettingConstants.QueryEditorTab, this.EnableQueryEditor);
- userSettingService.SetUserSetting(UserSettingConstants.PromptOnUnmatchingQueries, this.PromptOnDifferentQuery);
userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);
userSettingService.SetUserSetting(ASUserSettingConstants.ShowCLI, this.ShowCliWindow);
userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 13aabe5e8..cc882b160 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.ViewModels
{
using System.Collections.Generic;
using System.Collections.ObjectModel;
+ using System.Collections.Specialized;
using System.ComponentModel.Composition;
using System.Linq;
@@ -96,7 +97,6 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public IEnumerable<string> CharacterCodes { get; set; }
-
/// <summary>
/// Gets or sets SourceTracks.
/// </summary>
@@ -122,19 +122,7 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public void Add()
{
- if (this.SourceTracks != null)
- {
- Subtitle source = this.SourceTracks.FirstOrDefault();
- if (source != null)
- {
- SubtitleTrack track = new SubtitleTrack
- {
- SubtitleType = SubtitleType.VobSub
- };
-
- this.SubtitleTracks.Add(track);
- }
- }
+ this.Add(null);
}
/// <summary>
@@ -187,6 +175,8 @@ namespace HandBrakeWPF.ViewModels
{
this.SourceTracks = title.Subtitles;
this.SubtitleTracks = task.SubtitleTracks;
+
+ this.AutomaticSubtitleSelection();
}
/// <summary>
@@ -199,6 +189,155 @@ namespace HandBrakeWPF.ViewModels
{
// We don't currently support subtitles within presets.
}
+
+ /// <summary>
+ /// Automatic Subtitle Selection based on user preferences.
+ /// </summary>
+ public void AutomaticSubtitleSelection()
+ {
+ this.SubtitleTracks.Clear();
+
+ // New DUB Settings
+ int mode = UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
+ switch (mode)
+ {
+ case 1: // Adding all remaining subtitle tracks
+ this.AddAllRemaining();
+ break;
+ case 2: // Adding only the first or preferred first subtitle track.
+ this.Add();
+ break;
+ case 3: // Selected Languages Only
+ this.AddAllRemainingForSelectedLanguages();
+ break;
+ case 4: // Prefered Only
+ this.AddForPreferredLanaguages(true);
+ break;
+ case 5: // Prefered Only All
+ this.AddForPreferredLanaguages(false);
+ break;
+ }
+
+ // Add all closed captions if enabled.
+ this.AddAllClosedCaptions();
+ }
+
+ #endregion
+
+ #region Private Methods
+
+ /// <summary>
+ /// Add a subtitle track.
+ /// The Source track is set based on the following order. If null, it will skip to the next option.
+ /// 1. Passed in Subitle param
+ /// 2. First preferred Subtitle from source
+ /// 3. First subtitle from source.
+ /// Will not add a subtitle if the source has none.
+ /// </summary>
+ /// <param name="subtitle">
+ /// The subtitle. Use null to add preferred, or first from source (based on user preference)
+ /// </param>
+ private void Add(Subtitle subtitle)
+ {
+ if (this.SourceTracks != null)
+ {
+ string preferred = UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
+
+ Subtitle source = subtitle ?? (this.SourceTracks.FirstOrDefault(l => l.Language == preferred) ??
+ this.SourceTracks.FirstOrDefault());
+
+ if (source != null)
+ {
+ SubtitleTrack track = new SubtitleTrack
+ {
+ SubtitleType = SubtitleType.VobSub,
+ SourceTrack = source,
+ };
+
+ this.SubtitleTracks.Add(track);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Add all the remaining subtitle tracks.
+ /// </summary>
+ private void AddAllRemaining()
+ {
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(null))
+ {
+ this.Add(subtitle);
+ }
+ }
+
+ /// <summary>
+ /// Add all remaining tracks for the users preferred and selected languages
+ /// </summary>
+ private void AddAllRemainingForSelectedLanguages()
+ {
+ // Get a list of subtitle tracks that match the users lanaguages
+ StringCollection userSelectedLanguages = UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
+ userSelectedLanguages.Add(UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles));
+ List<Subtitle> availableTracks = this.SourceTracks.Where(subtitle => userSelectedLanguages.Contains(subtitle.Language)).ToList();
+
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(availableTracks))
+ {
+ this.Add(subtitle);
+ }
+ }
+
+ /// <summary>
+ /// Add all tracks for the preferred languages settings.
+ /// </summary>
+ /// <param name="firstOnly">
+ /// The first only.
+ /// </param>
+ private void AddForPreferredLanaguages(bool firstOnly)
+ {
+ string preferred = UserSettingService.GetUserSetting<string>(
+ UserSettingConstants.NativeLanguageForSubtitles);
+
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(null))
+ {
+ if (subtitle.Language == preferred)
+ {
+ this.Add(subtitle);
+ if (firstOnly)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// Add all closed captions not already on the list.
+ /// </summary>
+ private void AddAllClosedCaptions()
+ {
+ if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))
+ {
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))
+ {
+ this.Add(subtitle);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets a list of Source subtitle tracks that are not currently used.
+ /// </summary>
+ /// <param name="subtitles">
+ /// The subtitles. (Optional). If null, works on the full source subtitle collection
+ /// </param>
+ /// <returns>
+ /// An IEnumerable collection of subtitles
+ /// </returns>
+ private IEnumerable<Subtitle> SourceTitlesSubset(IEnumerable<Subtitle> subtitles)
+ {
+ return subtitles != null ? subtitles.Where(subtitle => !this.SubtitleTracks.Any(track => track.SourceTrack == subtitle)).ToList()
+ : this.SourceTracks.Where(subtitle => !this.SubtitleTracks.Any(track => track.SourceTrack == subtitle)).ToList();
+ }
#endregion
}
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 37a11a016..e39625785 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -160,9 +160,18 @@
<ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding Angles}" SelectedItem="{Binding SelectedAngle}"/>
<ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" ItemsSource="{Binding RangeMode}" SelectedItem="{Binding SelectedPointToPoint}" />
- <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}" />
+
+ <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}"
+ Visibility="{Binding ShowTextEntryForPointToPointMode,Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+ <TextBox Name="StartPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedStartPoint}"
+ Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"/>
+
<Label Content="through" Margin="8,0,0,0" />
- <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}" />
+ <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}"
+ Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+ <TextBox Name="EndPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedEndPoint}"
+ Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
<Label Content="Duration" Margin="8,0,0,0" />
<Label Content="{Binding Duration}" Margin="8,0,0,0" />
</StackPanel>
@@ -174,7 +183,7 @@
<StackPanel Orientation="Horizontal">
<Label Content="File" Margin="8,0,0,0" />
<TextBox Name="Destination" Margin="8,0,0,0" Width="600" Text="{Binding CurrentTask.Destination}" />
- <Button Name="DestinationBrowser" Margin="8,0,0,0" Padding="8,0,8,0" Content="Browse" Micro:Message.Attach="[Event Click] = [Action BrowseDestination]" />
+ <Button Name="DestinationBrowser" Margin="8,0,0,0" Content="Browse" Micro:Message.Attach="[Event Click] = [Action BrowseDestination]" />
</StackPanel>
</StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 006b6e1ab..cc5d5f775 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -322,8 +322,6 @@
<StackPanel Orientation="Vertical" Grid.Column="1">
<CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
<CheckBox Content="Display status messages from tray icon (balloon popups)" IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />
- <CheckBox Content="Enable 'Query Editor' tab (Requires Restart)" IsChecked="{Binding EnableQueryEditor}" />
- <CheckBox Content="Prompt when a manual query does not match GUI settings" Margin="10,0,0,5" IsChecked="{Binding PromptOnDifferentQuery}" />
<CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
<CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" IsChecked="{Binding ShowCliWindow}" />
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 898d5df64..0492fcaed 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -74,7 +74,7 @@
<!-- Row 1-->
<TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
- <ComboBox Width="100" ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ <ComboBox Width="120" ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
SelectedItem="{Binding SourceTrack}" Grid.Column="1" Margin="5,0,5,0" Height="22" />
<TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
<CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"/>
@@ -85,11 +85,18 @@
<!-- Row 2-->
<TextBlock Text="Language" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
- <ComboBox Width="100" Grid.Column="1" ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" SelectedItem="{Binding SrtLang}" Margin="5,0,5,0" Grid.Row="1" Height="22" />
+ <ComboBox Width="120" Grid.Column="1"
+ ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SrtLang}" Margin="5,0,5,0" Grid.Row="1" Height="22"
+ IsEnabled="{Binding IsSrtSubtitle}"/>
<TextBlock Text="Char Code" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>
- <ComboBox Width="100" Grid.Column="3" ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" SelectedItem="{Binding SrtCharCode}" Grid.Row="1" Margin="5,0,5,0" Height="22" />
+ <ComboBox Width="100" Grid.Column="3"
+ ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SrtCharCode}" Grid.Row="1" Margin="5,0,5,0" Height="22"
+ IsEnabled="{Binding IsSrtSubtitle}" />
<TextBlock Text="Offset (ms)" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>
- <NumericUpDown:NumericUpDown Width="45" Value="{Binding SrtOffset}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left" Margin="5,0,5,0" />
+ <NumericUpDown:NumericUpDown Width="65" Value="{Binding SrtOffset}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left"
+ IsEnabled="{Binding IsSrtSubtitle}" Margin="5,0,5,0" />
</Grid>
diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index f9acde1ce..ce18ff680 100644
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -274,7 +274,7 @@
</item>
<item>
<key>
- <string>NativeLanguageForSubtitles</string>
+ <string>NativeLanguageSubtitles</string>
</key>
<value>
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
diff --git a/win/CS/defaultsettings.xml b/win/CS/defaultsettings.xml
index f9acde1ce..ce18ff680 100644
--- a/win/CS/defaultsettings.xml
+++ b/win/CS/defaultsettings.xml
@@ -274,7 +274,7 @@
</item>
<item>
<key>
- <string>NativeLanguageForSubtitles</string>
+ <string>NativeLanguageSubtitles</string>
</key>
<value>
<anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 20:19:46 +0000