From d26d290873503259f71d7c09d3fb3377cc2c9ae8 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 18 Apr 2015 14:08:09 +0000
Subject: [PATCH] WinGui: Misc UI fixes and fixes to the logging code for
 scanning that could sometimes cause a crash.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7094 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../Services/Scan/LibScan.cs                  |  18 ++-
 .../Controls/SourceSelection.xaml             |   6 +-
 win/CS/HandBrakeWPF/Controls/StatusPanel.xaml |  68 ++++++++---
 .../HandBrakeWPF/Controls/StatusPanel.xaml.cs |  78 ++++++++++++-
 .../HandBrakeWPF/ViewModels/MainViewModel.cs  |  12 ++
 win/CS/HandBrakeWPF/Views/AboutView.xaml      |   4 +-
 win/CS/HandBrakeWPF/Views/MainView.xaml       |  22 ++--
 win/CS/HandBrakeWPF/Views/OptionsView.xaml    | 106 ++++++++----------
 win/CS/HandBrakeWPF/Views/ShellView.xaml      |   4 +-
 9 files changed, 218 insertions(+), 100 deletions(-)

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index a560493ab..6e16fa937 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -168,8 +168,12 @@ namespace HandBrake.ApplicationServices.Services.Scan
             {
                 try
                 {
-                    this.scanLog.Close();
-                    this.scanLog.Dispose();
+                    lock (LogLock)
+                    {
+                        this.scanLog.Close();
+                        this.scanLog.Dispose();
+                        this.scanLog = null;
+                    }
                     this.instance.Dispose();
                 }
                 catch (Exception)
@@ -227,10 +231,14 @@ namespace HandBrake.ApplicationServices.Services.Scan
                 this.IsScanning = false;
                 this.instance.StopScan();
 
-                if (this.scanLog != null)
+                lock (LogLock)
                 {
-                    this.scanLog.Close();
-                    this.scanLog.Dispose();
+                    if (this.scanLog != null)
+                    {
+                        this.scanLog.Close();
+                        this.scanLog.Dispose();
+                        this.scanLog = null;
+                    }
                 }
             }
             catch (Exception)
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index dd7650b31..44d600c4e 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -15,11 +15,11 @@
         
         
         <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,8,0,0">
-            <TextBlock Text="Source Selection" FontSize="14" FontWeight="Bold" /> 
+            <TextBlock Text="Source Selection" FontSize="26" FontFamily="Segoe UI Light" /> 
         </StackPanel>
 
         <!-- Title Specific Scan -->
-        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,5,0,0">
+        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,15,0,0">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="Optionally choose a specific title: " />
 
@@ -86,7 +86,7 @@
         </Grid>
 
         <!-- Cancel Window -->
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
             <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />
         </StackPanel>
 
diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
index 481c2eedb..4c4fbe20d 100644
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
@@ -1,28 +1,60 @@
-<UserControl x:Class="HandBrakeWPF.Controls.StatusPanel"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ctr="clr-namespace:HandBrakeWPF.Controls">
+             xmlns:ctr="clr-namespace:HandBrakeWPF.Controls"
+             x:Class="HandBrakeWPF.Controls.StatusPanel"
+             FontFamily="S"
+             >
 
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="boolTovisibility" />
     </UserControl.Resources>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
 
-    <DockPanel Background="Black" Opacity="0.85"
-               Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, 
-                            Path=IsLoading, Mode=OneWay, Converter={StaticResource boolTovisibility}}">
+        <StackPanel Grid.Row="0" Background="Black" Opacity="0.45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
 
-        <ctr:Loading DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Top"
-                     Height="45" Margin="18,10" />
+        <Grid VerticalAlignment="Center" Grid.Row="1" HorizontalAlignment="Stretch"
+			Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
+            
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="220" MinHeight="220">
+                <ctr:Loading HorizontalAlignment="Center" VerticalAlignment="Center" Height="45" Margin="18,10" />
+
+                <StackPanel VerticalAlignment="Center" Orientation="Vertical" >
+                    <StackPanel VerticalAlignment="Center" MinWidth="300">
+                        <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="26" FontFamily="Segoe UI Light" Margin="0,11,0,0" HorizontalAlignment="Left"
+						    FontWeight="Bold" TextWrapping="WrapWithOverflow"
+						    Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+                           />
+
+                        <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" FontFamily="Segoe UI Light" Margin="0,5" HorizontalAlignment="Left"
+						    Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
+						    TextWrapping="WrapWithOverflow"
+                           />
+                    </StackPanel>
+             
+                    <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"
+                            x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" HorizontalAlignment="Right"
+                            Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
+
+                </StackPanel>
+            </StackPanel>
+
+            
+        </Grid>
+
+        <StackPanel Grid.Row="2" Background="Black" Opacity="0.45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+
+    </Grid>
 
-        <StackPanel VerticalAlignment="Top">
-            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" Margin="0,11,0,0" HorizontalAlignment="Left"
-                       FontWeight="Bold"
-                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=Message}" 
-                       Foreground="LightBlue" />
 
-            <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="12" Margin="0,5" HorizontalAlignment="Left"
-                       Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=SubMessage}" 
-                       Foreground="LightBlue" />
-        </StackPanel>
-    </DockPanel>
 </UserControl>
diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
index 92ca002d5..404e2981b 100644
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs
@@ -9,6 +9,7 @@
 
 namespace HandBrakeWPF.Controls
 {
+    using System;
     using System.Windows;
     using System.Windows.Controls;
 
@@ -23,6 +24,7 @@ namespace HandBrakeWPF.Controls
         public StatusPanel()
         {
             InitializeComponent();
+            this.Message = "Message";
         }
 
         /// <summary>
@@ -35,13 +37,25 @@ namespace HandBrakeWPF.Controls
         /// Dependancy Property for the Message Property
         /// </summary>
         public static readonly DependencyProperty MessageProperty =
-            DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));
+            DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata("Loading..."));
 
         /// <summary>
         /// Dependancy Property for the submessage propery
         /// </summary>
         public static readonly DependencyProperty SubMessageProperty =
-            DependencyProperty.Register("SubMessage", typeof(string), typeof(StatusPanel), new UIPropertyMetadata(string.Empty));
+            DependencyProperty.Register("SubMessage", typeof(string), typeof(StatusPanel), new FrameworkPropertyMetadata("Please Wait", FrameworkPropertyMetadataOptions.AffectsRender));
+
+        /// <summary>
+        /// Dependancy Property for the submessage propery
+        /// </summary>
+        public static readonly DependencyProperty ActionProperty =
+            DependencyProperty.Register("CancelAction", typeof(Action), typeof(StatusPanel), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.None, OnCancelActionSet));
+
+        /// <summary>
+        /// Dependancy Property for the submessage propery
+        /// </summary>
+        public static readonly DependencyProperty ActionTextProperty =
+            DependencyProperty.Register("ActionText", typeof(string), typeof(StatusPanel), new UIPropertyMetadata("Cancel"));
 
         /// <summary>
         /// Gets or sets a value indicating whether IsLoading.
@@ -69,5 +83,65 @@ namespace HandBrakeWPF.Controls
             get { return (string)GetValue(SubMessageProperty); }
             set { SetValue(SubMessageProperty, value); }
         }
+
+        /// <summary>
+        /// Gets or sets the cancel action.
+        /// </summary>
+        public Action CancelAction
+        {
+            get { return (Action)GetValue(ActionProperty); }
+            set { SetValue(SubMessageProperty, value); }
+        }
+
+        /// <summary>
+        /// The on cancel action set.
+        /// </summary>
+        /// <param name="d">
+        /// The d.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private static void OnCancelActionSet(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+       
+        }
+
+        /// <summary>
+        /// Gets or sets the action text.
+        /// </summary>
+        public string ActionText
+        {
+            get { return (string)GetValue(ActionTextProperty); }
+            set { SetValue(ActionTextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether is action button visible.
+        /// </summary>
+        public bool IsActionButtonVisible
+        {
+            get
+            {
+                return true; // this.CancelAction != null;
+            }
+        }
+
+        /// <summary>
+        /// The status action button_ on click.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void StatusActionButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (this.CancelAction != null)
+            {
+                this.CancelAction();
+            }
+        }
     }
 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 71d8c6a73..7465ceb10 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -53,6 +53,7 @@ namespace HandBrakeWPF.ViewModels
 
     using Ookii.Dialogs.Wpf;
 
+    using Action = System.Action;
     using Execute = Caliburn.Micro.Execute;
     using IQueueProcessor = HandBrakeWPF.Services.Queue.Interfaces.IQueueProcessor;
 
@@ -1046,6 +1047,17 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }
 
+        /// <summary>
+        /// Gets the cancel action.
+        /// </summary>
+        public Action CancelAction
+        {
+            get
+            {
+                return this.CancelScan;
+            }
+        }
+
         #endregion
 
         #region Load and Shutdown Handling
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index d7b63c08b..ac625ef5d 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -34,8 +34,8 @@
                 <StackPanel Grid.Row="0"
                             Margin="5,10,0,0"
                             Orientation="Horizontal">
-                    <TextBlock Margin="0,0,5,0" FontSize="12" FontWeight="Bold" Text="HandBrake " />
-                    <TextBlock Margin="0,0,0,1" FontSize="12" VerticalAlignment="Bottom" Text="{Binding Version}" />
+                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="Version: " />
+                    <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />
                 </StackPanel>
 
                 <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="License: " />
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 44a46b195..8e365891a 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -641,24 +641,26 @@
 
         <!-- Source Selection-->
         <Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
-                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" Panel.ZIndex="1"
+                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, TargetNullValue=Collapsed, FallbackValue=Collapsed}" Panel.ZIndex="1"
                                   />
 
 
-        <DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"
+        <!--<DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"
                    Grid.Row="1"
-                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />-->
 
-        <!--  StatusPanel  -->
+        <!--  StatusPanel   Height="70" -->
         <Controls:StatusPanel x:Name="loadingPanel"
-                              Grid.Row="1"
-                              Grid.RowSpan="2"
-                              Height="70"
-                              VerticalAlignment="Bottom"
+                              Grid.Row="0"
+                              Grid.RowSpan="3"
+                              Visibility="{Binding ShowStatusWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
+                              VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
                               Panel.ZIndex="10"
                               IsLoading="{Binding ShowStatusWindow}"
-                              Message="{Binding StatusLabel}"
-                              SubMessage="Please Wait ..."
+                              Message="Please wait ..."
+                              SubMessage="{Binding StatusLabel}"
+                              ActionText="Cancel"
+                              CancelAction="{Binding CancelAction}"
                               />
 
         <!--  Status Bar  -->
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 52f9568d2..a558cd525 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -53,50 +53,51 @@
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <StackPanel Orientation="Vertical" Grid.Column="0" Margin="10,10,0,0">
-            <Border BorderThickness="0 0 0 1" BorderBrush="LightGray" Margin="0,0,0,10">
-                <TextBlock Text="Preferences" FontSize="16" />
-            </Border>
+        <!-- Row 1 -->
+        <TextBlock Text="Options" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />
+
+        <Border BorderBrush="DarkGray"  Grid.Column="0" Grid.Row="1"  BorderThickness="0,0,1,0">
+            <StackPanel Orientation="Vertical" Margin="11,5,-1,0">
 
-            <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"
+                <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"
                      BorderThickness="0" Background="Transparent">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-        </StackPanel>
+            </StackPanel>
+        </Border>
 
-        <ScrollViewer Grid.Column="1">
+        <ScrollViewer Grid.Column="1" Grid.Row="1" >
             <StackPanel Orientation="Vertical">
 
-                <StackPanel Name="General" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel Name="General" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.General}}">
 
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="General" FontSize="16" />
-                    </Border>
+                    <TextBlock Text="General" FontSize="20" FontFamily="Segoe UI Light"  />
 
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-                        <TextBlock Text="On Startup" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+                        <TextBlock Text="On Startup" FontSize="14" Margin="0,0,0,10"/>
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
                             <CheckBox Content="Check for Updates" IsChecked="{Binding CheckForUpdates}" />
                             <ComboBox Name="checkForUpdateFrequency" ItemsSource="{Binding CheckForUpdatesFrequencies}" SelectedIndex="{Binding CheckForUpdatesFrequency}" Margin="25,0,0,5" HorizontalAlignment="Left" Width="120"></ComboBox>
                         </StackPanel>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical" Margin="0,0,0,20">
-                        <TextBlock Text="When Done" Grid.Column="0" FontSize="14" Margin="0,0,0,10" />
+                        <TextBlock Text="When Done" FontSize="14" Margin="0,0,0,10" />
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
                             <StackPanel Orientation="Horizontal">
                                 <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120"  HorizontalAlignment="Left" />
 
@@ -158,18 +159,16 @@
                     </StackPanel>
                 </StackPanel>
 
-                <StackPanel Name="Output" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel Name="Output" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.OutputFiles}}">
 
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="Output Files" FontSize="16" />
-                    </Border>
+                    <TextBlock Text="Output Files" FontSize="20" FontFamily="Segoe UI Light"  />
 
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-                        <TextBlock Text="Automatic File Naming" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+                        <TextBlock Text="Automatic File Naming" FontSize="14" Margin="0,0,0,10"/>
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
                             <CheckBox Content="Automatically name output files" IsChecked="{Binding AutomaticallyNameFiles}" />
 
                             <Grid Margin="0,5,0,0">
@@ -182,7 +181,7 @@
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                
+
                                 <TextBlock VerticalAlignment="Center" Text="Default Path: " Grid.Column="0" Grid.Row="0" />
                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" 
                                          ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}"  />
@@ -208,14 +207,12 @@
                     </StackPanel>
                 </StackPanel>
 
-                <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">
 
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="Video" FontSize="16" />
-                    </Border>
+                    <TextBlock Text="Video" FontSize="20" FontFamily="Segoe UI Light" />
 
-                    <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,20">
 
                         <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" />
 
@@ -232,7 +229,7 @@
                         </StackPanel>
 
                         <TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" />
-                        
+
                         <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
                             <TextBlock Text="Choose Scaler: " Margin="0,0,5,0" VerticalAlignment="Center" />
                             <ComboBox  ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" 
@@ -244,24 +241,23 @@
                             <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap"
                                        Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />
                         </StackPanel>
-               
+
                     </StackPanel>
 
-             
+
                 </StackPanel>
 
-                <StackPanel  Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel  Name="Advanced" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">
 
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="Advanced" FontSize="16" />
-                    </Border>
+
+                    <TextBlock Text="Advanced" FontSize="20" FontFamily="Segoe UI Light"  />
 
                     <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
-                        <TextBlock Text="Advanced Options" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+                        <TextBlock Text="Advanced Options" FontSize="14" Margin="0,0,0,10"/>
 
-                        <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">
                             <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                 <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
@@ -327,15 +323,13 @@
 
                 </StackPanel>
 
-                <StackPanel Name="Updates" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel Name="Updates" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Updates}}">
 
 
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="Updates" FontSize="16" />
-                    </Border>
+                    <TextBlock Text="Updates" FontSize="20" FontFamily="Segoe UI Light" />
 
-                    <TextBlock Text="Current Version" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
+                    <TextBlock Text="Current Version" FontSize="14" Margin="0,10,0,10"/>
 
                     <Grid Margin="20,10,0,20">
                         <Grid.ColumnDefinitions>
@@ -348,7 +342,7 @@
                         <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />
                     </Grid>
 
-                    <TextBlock Text="Updates" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
+                    <TextBlock Text="Updates" FontSize="14" Margin="0,10,0,10"/>
 
                     <StackPanel Margin="20,0,0,0" Orientation="Horizontal">
                         <Button Content="Check for Updates" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
@@ -358,20 +352,17 @@
                     <StackPanel Margin="20,10,0,0" Orientation="Horizontal">
                         <ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}" 
                                  Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
-                        
+
                     </StackPanel>
 
                     <TextBlock Text="{Binding UpdateMessage}" Margin="20,5,10,0" VerticalAlignment="Center" TextWrapping="Wrap" />
 
                 </StackPanel>
 
-                <StackPanel Name="About" Orientation="Vertical" Margin="10,10,0,0"
+                <StackPanel Name="About" Orientation="Vertical" Margin="10,5,0,0"
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">
 
-
-                    <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
-                        <TextBlock Text="About HandBrake" FontSize="16" />
-                    </Border>
+                    <TextBlock Text="About HandBrake" FontSize="20" FontFamily="Segoe UI Light"  />
 
                     <ContentControl x:Name="AboutViewModel" />
 
@@ -379,7 +370,7 @@
             </StackPanel>
         </ScrollViewer>
 
-        <StackPanel HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2" >
+        <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.ColumnSpan="2" >
             <StackPanel.Style>
                 <Style TargetType="StackPanel">
                     <Style.Triggers>
@@ -389,11 +380,10 @@
                     </Style.Triggers>
                 </Style>
             </StackPanel.Style>
-            
+
             <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
                     HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
         </StackPanel>
-
-
     </Grid>
+
 </UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 063678da5..9524199b9 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -39,8 +39,8 @@
         <DockPanel Background="Black" Opacity="0.60" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="1"
                Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
         
-        <ContentControl x:Name="OverlayPanelViewModel"  Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" 
-                        VerticalAlignment="Center" HorizontalAlignment="Center" Panel.ZIndex="2" MinWidth="900" MinHeight="675"  />
+        <!--<ContentControl x:Name="OverlayPanelViewModel"  Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" 
+                        VerticalAlignment="Center" HorizontalAlignment="Center" Panel.ZIndex="2" MinWidth="900" MinHeight="675"  />-->
 
 
     </Grid>
-- 
2.40.0