From 469301c18865069281bb160a498aa7204bdfe06e Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 20 Apr 2019 23:24:29 +0100
Subject: WinGui: Improvements to Options layout.  "General" tab has been
 split. "When Done" options now get their own tab.

---
 win/CS/HandBrakeWPF/Views/OptionsView.xaml | 98 ++++++++++++++++--------------
 1 file changed, 53 insertions(+), 45 deletions(-)

(limited to 'win/CS/HandBrakeWPF/Views/OptionsView.xaml')

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 690a1c341..7bccf0e1b 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -131,51 +131,6 @@
                         </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Orientation="Vertical" Margin="0,0,0,10">
-                        <TextBlock Text="{x:Static Properties:Resources.Options_WhenDone}" FontSize="14" Margin="0,0,0,10" />
-
-                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
-                            <StackPanel Orientation="Horizontal">
-                                <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left" />
-                                <CheckBox Content="{x:Static Properties:Resources.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="5,0,0,0" IsChecked="{Binding ResetWhenDoneAction}" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{x:Static Properties:Resources.Options_SendFileTo}" VerticalAlignment="Center" />
-                                        <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0"  />
-                                    </StackPanel>
-                                </CheckBox>
-       
-                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                                <TextBlock VerticalAlignment="Center"  Margin="25,0,5,0" Text="{x:Static Properties:Resources.Options_Arguments}" />
-                                <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" />
-                            </StackPanel>
-
-                            <StackPanel Orientation="Vertical" Margin="0,7,0,0">
-                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenDone}"  
-                                          VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenDone}" Margin="0,1,0,0" />
-                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenQueueDone}"  
-                                          VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenQueueDone}" Margin="0,5,0,0" />
-                                <StackPanel Orientation="Horizontal" Margin="25,2,0,0">
-                                    <TextBlock Text="{Binding WhenDoneAudioFile}" VerticalAlignment="Center" Margin="5,2,5,0"  />
-                                    <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseWhenDoneAudioFile]" />
-                                </StackPanel>
-                
-                            </StackPanel>
-
-
-                        </StackPanel>
-                    </StackPanel>
-
                     <StackPanel Orientation="Vertical" Margin="0,0,0,10">
 
                         <TextBlock Text="{x:Static Properties:Resources.Options_PathToVLC}" FontSize="14" Margin="0,0,0,10"/>
@@ -258,6 +213,59 @@
                     </StackPanel>
                 </StackPanel>
 
+                <StackPanel Name="WhenDone" Orientation="Vertical" Margin="10,5,0,0"
+                            Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.WhenDone}}">
+
+                    <TextBlock Text="{x:Static Properties:Resources.Options_WhenDone}" FontSize="20" FontFamily="Segoe UI Light"  />
+
+                    <TextBlock Text="{x:Static Properties:Resources.Options_QueueCompleted}" FontSize="14" Margin="0,10,0,10" />
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,10">
+
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{x:Static Properties:Resources.Options_WhenDoneColon}" />
+                                <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left" />
+                                <CheckBox Content="{x:Static Properties:Resources.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="5,0,0,0" IsChecked="{Binding ResetWhenDoneAction}" />
+                            </StackPanel>
+                        </StackPanel>
+
+                        <TextBlock Text="{x:Static Properties:Resources.Options_EncodeCompleted}" FontSize="14" Margin="0,10,0,10" />
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{x:Static Properties:Resources.Options_SendFileTo}" VerticalAlignment="Center" />
+                                        <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0"  />
+                                    </StackPanel>
+                                </CheckBox>
+
+                                <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                                <TextBlock VerticalAlignment="Center"  Margin="25,0,5,0" Text="{x:Static Properties:Resources.Options_Arguments}" />
+                                <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" />
+                            </StackPanel>
+                        </StackPanel>
+
+                        <TextBlock Text="{x:Static Properties:Resources.Options_Notifications}" FontSize="14" Margin="0,10,0,10" />
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                            <StackPanel Orientation="Vertical" Margin="0,7,0,0">
+                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenDone}"  
+                                          VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenDone}" Margin="0,1,0,0" />
+                                <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenQueueDone}"  
+                                          VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding PlaySoundWhenQueueDone}" Margin="0,5,0,0" />
+                                <StackPanel Orientation="Horizontal" Margin="25,2,0,0">
+                                    <TextBlock Text="{Binding WhenDoneAudioFile}" VerticalAlignment="Center" Margin="5,2,5,0"  />
+                                    <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseWhenDoneAudioFile]" />
+                                </StackPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </StackPanel>
+
+                </StackPanel>
+
                 <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">
 
-- 
cgit v1.2.3