summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF')
-rw-r--r--win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs4
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs16
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs2
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/ActivityWindow.pngbin3128 -> 3113 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.pngbin798 -> 801 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/Images/Output_Small.pngbin798 -> 806 bytes
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml77
7 files changed, 58 insertions, 41 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
index 2a7350b33..9c561e549 100644
--- a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
@@ -39,8 +39,8 @@ namespace HandBrakeWPF.Converters.Options
case "Output Files":
if (parameter.ToString() == "Output Files") return Visibility.Visible;
break;
- case "Language":
- if (parameter.ToString() == "Language") return Visibility.Visible;
+ case "Audio and Subtitles":
+ if (parameter.ToString() == "Audio and Subtitles") return Visibility.Visible;
break;
case "Advanced":
if (parameter.ToString() == "Advanced") return Visibility.Visible;
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 6404188c0..9511de2ae 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -393,7 +393,7 @@ namespace HandBrakeWPF.ViewModels
{
get
{
- return new List<string> { "General", "Output Files", "Language", "Advanced", "Updates" };
+ return new List<string> { "General", "Output Files", "Audio and Subtitles", "Advanced", "Updates" };
}
}
@@ -1579,16 +1579,16 @@ namespace HandBrakeWPF.ViewModels
this.AddAudioModeOptions.Clear();
this.AddAudioModeOptions.Add("None");
- this.AddAudioModeOptions.Add("All Remaining Tracks");
- this.AddAudioModeOptions.Add("All for Selected Languages");
+ this.AddAudioModeOptions.Add("Add All Remaining Tracks");
+ this.AddAudioModeOptions.Add("Add All for Selected Languages");
this.AddSubtitleModeOptions.Clear();
this.AddSubtitleModeOptions.Add("None");
- this.AddSubtitleModeOptions.Add("All");
- this.AddSubtitleModeOptions.Add("First");
- this.AddSubtitleModeOptions.Add("Selected");
- this.AddSubtitleModeOptions.Add("Prefered Only (First)");
- this.AddSubtitleModeOptions.Add("Prefered Only (All)");
+ this.AddSubtitleModeOptions.Add("Add All (Where possible)");
+ this.AddSubtitleModeOptions.Add("Add First");
+ this.AddSubtitleModeOptions.Add("Add all for Selected Languages");
+ this.AddSubtitleModeOptions.Add("Add only for Prefered Language (First)");
+ this.AddSubtitleModeOptions.Add("Add all for Prefered Language");
this.SelectedAddAudioMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
this.SelectedAddSubtitleMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 1fb80023e..a3998be21 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -339,7 +339,7 @@ namespace HandBrakeWPF.ViewModels
public void EditJob(QueueTask task)
{
MessageBoxResult result = this.errorService.ShowMessageBox(
- "Are you sure you wish to edit this job?\nWARNING!!! This feature is not finished YET! Only part of the job will be copied back!!!",
+ "Are you sure you wish to edit this job? It will be removed from the queue and sent to the main window.",
"Modify Job?",
MessageBoxButton.YesNo,
MessageBoxImage.Question);
diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
index 9a6157f82..5e0961874 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
+++ b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
index a2de1eead..2a965dc04 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png b/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
index a2de1eead..566f1b1b2 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
Binary files differ
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 3e883a7ff..c7d2dc02d 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,5 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.OptionsView"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<UserControl x:Class="HandBrakeWPF.Views.OptionsView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options"
@@ -158,32 +157,67 @@
</StackPanel>
<StackPanel Name="Audio" Orientation="Vertical" Margin="10,10,0,0"
- Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Language'}">
-
+ Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Audio and Subtitles'}">
+
+
<Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
<TextBlock Text="Audio and Subtitle Language Handling" FontSize="16" />
</Border>
+ <TextBlock Text="Control the default selection behaviour for audio and subtitle tracks" Margin="0,10,0,10" />
- <TextBlock Text="Select your preferred language" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>
+ <TextBlock Text="Select your preferred languages" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>
<Grid Margin="20,10,0,0" >
<StackPanel Orientation="Horizontal">
- <TextBlock VerticalAlignment="Center" Text="Audio: " FontSize="10" />
- <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}" SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />
- <TextBlock VerticalAlignment="Center" Text="Subtitles: " FontSize="10" Margin="10,0,0,0" />
- <ComboBox Name="primarySubtitleLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}" SelectedItem="{Binding SelectedPreferredSubtitleLangauge}" Width="120" />
+ <TextBlock VerticalAlignment="Center" Text="Audio: " />
+ <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}"
+ SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />
+ <TextBlock VerticalAlignment="Center" Text="Subtitles: " Margin="10,0,0,0" />
+ <ComboBox Name="primarySubtitleLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}"
+ SelectedItem="{Binding SelectedPreferredSubtitleLangauge}" Width="120" />
</StackPanel>
</Grid>
- <TextBlock Text="Select languages for automatic inclusion" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+ <TextBlock Text="Automatic language selection behaviour" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+
+ <Grid Margin="20,10,0,0" >
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <!-- Audio -->
+ <TextBlock Text="Audio:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+ <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
+ ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
+ <CheckBox Content="Add only one audio track per language" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left"
+ IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" Margin="0,5,0,0" />
+
+ <!-- Subtitles -->
+ <TextBlock Text="Subtitle:" Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+ <ComboBox Name="autoSubtitleMode" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left"
+ ItemsSource="{Binding AddSubtitleModeOptions}" SelectedIndex="{Binding SelectedAddSubtitleMode}" Width="120" Margin="0,0,5,0" />
+ <CheckBox Content="Add Closed Captions when available" Grid.Column="3" Grid.Row="1" Margin="0,5,0,0"
+ HorizontalAlignment="Left" IsChecked="{Binding AddClosedCaptions}"/>
+ </Grid>
+
+ <TextBlock Text="Additional languages for possible selection" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
- <Grid Margin="20,10,0,0">
+ <Grid Margin="20,20,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
- <Grid Margin="10,0,0,0">
+ <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
@@ -205,7 +239,7 @@
</DockPanel>
<StackPanel Orientation="Vertical" Grid.Column="2">
- <TextBlock Text="Selected Languages" Margin="0,0,0,5"/>
+ <TextBlock Text="Chosen Selected Languages" Margin="0,0,0,5"/>
<ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}"
SelectionMode="Extended" Width="140" Height="140"
dd:DragDrop.DropHandler="{Binding}"
@@ -216,23 +250,6 @@
</StackPanel>
</Grid>
- <GroupBox Header="What to do (Automatically Add Tracks)" Margin="20,5,10,0" >
- <StackPanel Orientation="Vertical" Margin="0,5,0,5">
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="Audio:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />
- <ComboBox Name="autoAudioMode" ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
- <CheckBox Content="Add only one audio track per language" VerticalAlignment="Center" IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" />
- </StackPanel>
-
- <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <TextBlock Text="Subtitle:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />
- <ComboBox Name="autoSubtitleMode" ItemsSource="{Binding AddSubtitleModeOptions}" SelectedIndex="{Binding SelectedAddSubtitleMode}" Width="120" Margin="0,0,5,0" />
- </StackPanel>
-
- <CheckBox Content="Add Closed Captions when available" Margin="120,5,0,0" IsChecked="{Binding AddClosedCaptions}"/>
- </StackPanel>
- </GroupBox>
-
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
<Label Content="Audio Tab Options" FontSize="14"/>
<CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 09:49:15 +0000