WinGui: Initial work to refactor the Audio and Subtitle behavioural based automatic track selections. This is not quite complete yet but close enough for gathering feedback.

- Simplified UI design that's now available on the "Subtitle" and "Audio" tabs rather than the Options screen.
  The settings are no longer part of the app preferences. They are now per-preset. Build in presets default to None.
- Selected Languages can now be set independently for Audio and Video.
- Preferred Language is now part of the Selected Languages list.
- Warning: Import/Export of presets still to be implemented.  Design may yet change.






git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6036 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 0 insertions, 105 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index ad1a20ca4..4f28678c9 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -202,111 +202,6 @@
                     </StackPanel>

                 </StackPanel>

 

-                <StackPanel Name="Audio" Orientation="Vertical" Margin="10,10,0,0"

-                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.AudioAndSubtitles}}">

-

-

-                    <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 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: " />

-                            <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="Automatic language selection behaviour" Margin="10,20,0,0" FontSize="14"/>

-

-                    <Grid Margin="20,10,0,0" >

-                        <Grid.RowDefinitions>

-                            <RowDefinition Height="Auto" />

-                            <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}"/>

-                        <CheckBox Content="Add 'Foreign Audio Scan'"  Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 

-                                  HorizontalAlignment="Left" IsChecked="{Binding AddForeignAudioScanTrack}"/>

-                    </Grid>

-

-                    <TextBlock Text="Additional languages for possible selection" Margin="10,20,0,0" FontSize="14"/>

-

-                    <Grid Margin="20,20,0,0">

-                        <Grid.ColumnDefinitions>

-                            <ColumnDefinition Width="*" />

-                        </Grid.ColumnDefinitions>

-

-                        <StackPanel Orientation="Horizontal">

-                            <Grid>

-                                <Grid.ColumnDefinitions>

-                                    <ColumnDefinition Width="*" />

-                                    <ColumnDefinition Width="*" />

-                                    <ColumnDefinition Width="*" />

-                                </Grid.ColumnDefinitions>

-

-                                <StackPanel Orientation="Vertical" Grid.Column="0">

-                                    <TextBlock Text="Available Languages" Margin="0,0,0,5"/>

-                                    <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 

-                                             SelectionMode="Extended" Width="140" Height="140"></ListBox>

-                                </StackPanel>

-

-                                <DockPanel Grid.Column="1" Margin="10,0,10,0">

-                                    <StackPanel Orientation="Vertical" VerticalAlignment="Center">

-                                        <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />

-                                        <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />

-                                        <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>

-                                    </StackPanel>

-                                </DockPanel>

-

-                                <StackPanel Orientation="Vertical" Grid.Column="2">

-                                    <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}"

-                                             dd:DragDrop.IsDragSource="True"

-                                             dd:DragDrop.IsDropTarget="True"/>

-                                </StackPanel>

-                            </Grid>

-                        </StackPanel>

-                    </Grid>

-

-                    <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)"

-                                  Margin="20,0,0,0" />

-                    </StackPanel>

-

-                </StackPanel>

-

                 <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,10,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">