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: [PATCH] WinGui: Improvements to Options layout.  "General" tab has
 been split. "When Done" options now get their own tab.

---
 .../Converters/Options/OptionsTabConverter.cs |  4 +-
 win/CS/HandBrakeWPF/Model/OptionsTab.cs       |  3 +
 .../Properties/Resources.Designer.cs          | 36 +++++++
 win/CS/HandBrakeWPF/Properties/Resources.resx | 12 +++
 win/CS/HandBrakeWPF/Views/OptionsView.xaml    | 98 ++++++++++---------
 5 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
index c7837efd4..045c1dd22 100644
--- a/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
@@ -40,7 +40,9 @@ namespace HandBrakeWPF.Converters.Options
                     case OptionsTab.OutputFiles:
                         if ((OptionsTab)parameter == OptionsTab.OutputFiles) return Visibility.Visible;
                         break;
-
+                    case OptionsTab.WhenDone:
+                        if ((OptionsTab)parameter == OptionsTab.WhenDone) return Visibility.Visible;
+                        break;
                     case OptionsTab.Advanced:
                         if ((OptionsTab)parameter == OptionsTab.Advanced) return Visibility.Visible;
                         break;
diff --git a/win/CS/HandBrakeWPF/Model/OptionsTab.cs b/win/CS/HandBrakeWPF/Model/OptionsTab.cs
index c5bd35824..1ca93ca10 100644
--- a/win/CS/HandBrakeWPF/Model/OptionsTab.cs
+++ b/win/CS/HandBrakeWPF/Model/OptionsTab.cs
@@ -22,6 +22,9 @@ namespace HandBrakeWPF.Model
         [DisplayName("Output Files")]
         OutputFiles,
 
+        [DisplayName("When Done")]
+        WhenDone,
+
         [DisplayName("Video")]
         Video,
 
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 88d9ba549..e2e49c065 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -2625,6 +2625,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Encoode Completed.
+        /// </summary>
+        public static string Options_EncodeCompleted {
+            get {
+                return ResourceManager.GetString("Options_EncodeCompleted", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Encoding.
         /// </summary>
@@ -2715,6 +2724,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Notifications.
+        /// </summary>
+        public static string Options_Notifications {
+            get {
+                return ResourceManager.GetString("Options_Notifications", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to On Startup.
         /// </summary>
@@ -2805,6 +2823,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Queue Completed.
+        /// </summary>
+        public static string Options_QueueCompleted {
+            get {
+                return ResourceManager.GetString("Options_QueueCompleted", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove common punctuation.
         /// </summary>
@@ -2976,6 +3003,15 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to When Done:.
+        /// </summary>
+        public static string Options_WhenDoneColon {
+            get {
+                return ResourceManager.GetString("Options_WhenDoneColon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to x264/5 Settings.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index b81d9dbe2..b7d3b2562 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1954,4 +1954,16 @@ Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitra
   <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
     <value>File overwrite behaviour:</value>
   </data>
+  <data name="Options_EncodeCompleted" xml:space="preserve">
+    <value>Encoode Completed</value>
+  </data>
+  <data name="Options_Notifications" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="Options_QueueCompleted" xml:space="preserve">
+    <value>Queue Completed</value>
+  </data>
+  <data name="Options_WhenDoneColon" xml:space="preserve">
+    <value>When Done:</value>
+  </data>
 </root>
\ No newline at end of file
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}}">
 
-- 
2.40.0