WinGui:

- Refractor the Audio and Subtitle Defaults into their own View/ViewModel
- Add a new PopupWindow container system.
- Add "Edit Defaults" for Audio and Subtitles on the Add Preset Pane to make the feature more discoverable.  (Note, this does not change the existing settings on the Audio/Subtitle Tabs)

1 files changed, 60 insertions, 0 deletions

diff --git a/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml b/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml
new file mode 100644
index 000000000..2efe3fcd7
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/PopupWindowView.xaml
@@ -0,0 +1,60 @@
+<Window x:Class="HandBrakeWPF.Views.PopupWindowView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:properties="clr-namespace:HandBrakeWPF.Properties"
+             xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
+             d:DesignHeight="250"
+             d:DesignWidth="600"
+             Title="{Binding Title}"
+             ResizeMode="NoResize"
+             SizeToContent="WidthAndHeight"
+             WindowStartupLocation="CenterScreen"
+             TextOptions.TextFormattingMode="Display"
+             mc:Ignorable="d">
+    
+    <Window.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+    </Window.Resources>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <TextBlock Text="{Binding WindowTitle}" FontSize="26" FontFamily="Segoe UI Light" Margin="10,10,10,5" Grid.Row="0" />
+        <TextBlock Text="{Binding SubText}" Margin="10,0,0,15" Grid.Row="1" Visibility="{Binding SubTextVisible, Converter={StaticResource boolToVisConverter}}" />
+            
+        <ContentControl x:Name="ContentViewModel" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Row="2" Margin="0,0,10,10" />
+
+        <Grid Grid.Row="3"
+              Margin="0,20,0,0">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Button Grid.Column="1"
+                    Margin="0,5,10,10"
+                    cal:Message.Attach="[Event Click] = [Action Cancel]"
+                    Content="{x:Static properties:ResourcesUI.Generic_Cancel}"
+                    IsCancel="True"
+                    Padding="8,2" />
+            <Button Grid.Column="2"
+                    Margin="0,5,10,10"
+                    cal:Message.Attach="[Event Click] = [Action Save]"
+                    Content="{x:Static properties:ResourcesUI.Generic_Save}"
+                    IsDefault="True"
+                    Padding="8,2" />
+        </Grid>
+
+    </Grid>
+   
+</Window>