WinGui: Change the Audio Default and Subtitle panels to be modal windows. (Similar to the MacGUI). This should allow for more space needed to implement Audio templates. Also fixed a sanitise mixdown call crash.

1 files changed, 1 insertions, 13 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 8620646da..812361428 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -17,7 +17,6 @@
              x:Name="audioTab">

 

     <UserControl.Resources>

-        <Conveters:EnumComboConverter x:Key="enumComboConverter" />

         <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />

         <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />

         <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />

@@ -47,13 +46,6 @@
                    VerticalAlignment="Top"

                    Text="{Binding PanelTitle}" />

 

-        <Button MinWidth="65" Grid.Row="0" Grid.Column="1"

-                Margin="0,5,10,0"

-                cal:Message.Attach="[Event Click] = [Action ShowAudioDefaults]"

-                Content="{Binding SwitchDisplayTitle}"

-                Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}}"

-                />

-

         <!-- Row 1 -->

         <Grid Grid.Row="1" Margin="10,5,10,0" Grid.Column="0" 

               Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">

@@ -121,7 +113,7 @@
                     <Separator />

                     <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Clear}" cal:Message.Attach="[Event Click] = [Action Clear]" />

                     <Separator />

-                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action SetDefaultBehaviour]" />

+                    <MenuItem Header="{x:Static Properties:ResourcesUI.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="[Event Click] = [Action ShowAudioDefaults]" />

                 </ContextMenu>

             </ListBox.ContextMenu>

 

@@ -278,9 +270,5 @@
             </ListBox.ItemTemplate>

         </ListBox>

 

-        <!-- Audio Defaults -->

-        <ContentControl x:Name="AudioDefaultsViewModel"  Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,0,0"

-              Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, FallbackValue=Visible}" />

-

     </Grid>

 </UserControl>